bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Introduce DeriveResolution.

Browse source 
Making this a proper struct, and giving its fields names, makes things
easier to understand.
This commit is contained in:
Nicholas Nethercote 2024-04-25 15:13:53 +10:00
parent 11e95d43ae
commit e2d2b1c698
5 changed files with 32 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

11
compiler/rustc_expand/src/base.rs
View file

@ -968,7 +968,12 @@ impl SyntaxExtension {
/// Error type that denotes indeterminacy.
pub struct Indeterminate;
pub type DeriveResolutions = Vec<(ast::Path, Annotatable, Option<Lrc<SyntaxExtension>>, bool)>;
pub struct DeriveResolution {
pub path: ast::Path,
pub item: Annotatable,
pub exts: Option<Lrc<SyntaxExtension>>,
pub is_const: bool,
}
pub trait ResolverExpand {
fn next_node_id(&mut self) -> NodeId;
@ -1011,11 +1016,11 @@ pub trait ResolverExpand {
&mut self,
expn_id: LocalExpnId,
force: bool,
derive_paths: &dyn Fn() -> DeriveResolutions,
derive_paths: &dyn Fn() -> Vec<DeriveResolution>,
) -> Result<(), Indeterminate>;
/// Take resolutions for paths inside the `#[derive(...)]` attribute with the given `ExpnId`
/// back from resolver.
fn take_derive_resolutions(&mut self, expn_id: LocalExpnId) -> Option<DeriveResolutions>;
fn take_derive_resolutions(&mut self, expn_id: LocalExpnId) -> Option<Vec<DeriveResolution>>;
/// Path resolution logic for `#[cfg_accessible(path)]`.
fn cfg_accessible(
&mut self,

2
compiler/rustc_expand/src/expand.rs
View file

@ -482,7 +482,7 @@ impl<'a, 'b> MacroExpander<'a, 'b> {
derive_invocations.reserve(derives.len());
derives
.into_iter()
.map(|(path, item, _exts, is_const)| {
.map(|DeriveResolution { path, item, exts: _, is_const }| {
// FIXME: Consider using the derive resolutions (`_exts`)
// instead of enqueuing the derives to be resolved again later.
let expn_id = LocalExpnId::fresh_empty();