nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-01 15:01:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

resolve: Stable order for derive helper attributes

Browse Source
This commit is contained in:
Vadim Petrochenkov 2021-04-04 17:51:31 +03:00
parent fbf1bec482
commit b96584485a
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compiler/rustc_resolve/src/lib.rs
View File

@ -853,7 +853,7 @@ enum BuiltinMacroState {
struct DeriveData {
resolutions: DeriveResolutions,
helper_attrs: Vec<Ident>,
helper_attrs: Vec<(usize, Ident)>,
has_derive_copy: bool,
}

13
compiler/rustc_resolve/src/macros.rs
View File

@ -376,7 +376,7 @@ impl<'a> ResolverExpand for Resolver<'a> {
has_derive_copy: false,
});
let parent_scope = self.invocation_parent_scopes[&expn_id];
for (path, opt_ext) in &mut entry.resolutions {
for (i, (path, opt_ext)) in entry.resolutions.iter_mut().enumerate() {
if opt_ext.is_none() {
*opt_ext = Some(
match self.resolve_macro_path(
@ -391,7 +391,9 @@ impl<'a> ResolverExpand for Resolver<'a> {
let last_seg = path.segments.last().unwrap();
let span = last_seg.ident.span.normalize_to_macros_2_0();
entry.helper_attrs.extend(
ext.helper_attrs.iter().map(|name| Ident::new(*name, span)),
ext.helper_attrs
.iter()
.map(|name| (i, Ident::new(*name, span))),
);
}
entry.has_derive_copy |= ext.builtin_name == Some(sym::Copy);
@ -407,9 +409,10 @@ impl<'a> ResolverExpand for Resolver<'a> {
);
}
}
// If we get to here, then `derive_data` for the given `expn_id` will only be accessed by
// `take_derive_resolutions` later, so we can steal `helper_attrs` instead of cloning them.
self.helper_attrs.insert(expn_id, mem::take(&mut entry.helper_attrs));
// Sort helpers in a stable way independent from the derive resolution order.
entry.helper_attrs.sort_by_key(|(i, _)| *i);
self.helper_attrs
.insert(expn_id, entry.helper_attrs.iter().map(|(_, ident)| *ident).collect());
// Mark this derive as having `Copy` either if it has `Copy` itself or if its parent derive
// has `Copy`, to support cases like `#[derive(Clone, Copy)] #[derive(Debug)]`.
if entry.has_derive_copy || self.has_derive_copy(parent_scope.expansion) {