squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Review feedback: alpha-rename field from copy_derives to containers_derving_copy.

Browse source
This commit is contained in:
Felix S. Klock II 2019-11-04 10:09:58 +01:00
parent 0dfe0ed8e1
commit 99243616cc
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/librustc_resolve/lib.rs
View file

@ -936,7 +936,7 @@ pub struct Resolver<'a> {
/// `derive(Copy)` marks items they are applied to so they are treated specially later.
/// Derive macros cannot modify the item themselves and have to store the markers in the global
/// context, so they attach the markers to derive container IDs using this resolver table.
copy_derives: FxHashSet<ExpnId>,
containers_deriving_copy: FxHashSet<ExpnId>,
/// Parent scopes in which the macros were invoked.
/// FIXME: `derives` are missing in these parent scopes and need to be taken from elsewhere.
invocation_parent_scopes: FxHashMap<ExpnId, ParentScope<'a>>,
@ -1219,7 +1219,7 @@ impl<'a> Resolver<'a> {
single_segment_macro_resolutions: Default::default(),
multi_segment_macro_resolutions: Default::default(),
builtin_attrs: Default::default(),
copy_derives: Default::default(),
containers_deriving_copy: Default::default(),
active_features:
features.declared_lib_features.iter().map(|(feat, ..)| *feat)
.chain(features.declared_lang_features.iter().map(|(feat, ..)| *feat))

4
src/librustc_resolve/macros.rs
View file

@ -255,11 +255,11 @@ impl<'a> base::Resolver for Resolver<'a> {
}
fn has_derive_copy(&self, expn_id: ExpnId) -> bool {
self.copy_derives.contains(&expn_id)
self.containers_deriving_copy.contains(&expn_id)
}
fn add_derive_copy(&mut self, expn_id: ExpnId) {
self.copy_derives.insert(expn_id);
self.containers_deriving_copy.insert(expn_id);
}
}