bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Rollup merge of #92161 - petrochenkov:misclean, r=cjgillot

Browse source 
resolve: Minor miscellaneous cleanups from #89059

`@bors` rollup=always
This commit is contained in:
Matthias Krüger 2021-12-27 21:42:27 +01:00 • committed by GitHub
commit a11414d62e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

8
compiler/rustc_metadata/src/rmeta/decoder/cstore_impl.rs
View file

@ -415,16 +415,12 @@ impl CStore {
let span = data.get_span(id.index, sess); let span = data.get_span(id.index, sess);
let attrs = data.get_item_attrs(id.index, sess).collect();
let ident = data.item_ident(id.index, sess);
LoadedMacro::MacroDef( LoadedMacro::MacroDef(
ast::Item { ast::Item {
ident, ident: data.item_ident(id.index, sess),
id: ast::DUMMY_NODE_ID, id: ast::DUMMY_NODE_ID,
span, span,
attrs, attrs: data.get_item_attrs(id.index, sess).collect(),
kind: ast::ItemKind::MacroDef(data.get_macro(id.index, sess)), kind: ast::ItemKind::MacroDef(data.get_macro(id.index, sess)),
vis: ast::Visibility { vis: ast::Visibility {
span: span.shrink_to_lo(), span: span.shrink_to_lo(),

34
compiler/rustc_resolve/src/lib.rs
View file

@ -3419,27 +3419,21 @@ impl<'a> Resolver<'a> {
return v.clone(); return v.clone();
} }
let parse_attrs = || { let attr = self
let attrs = self.cstore().item_attrs(def_id, self.session); .cstore()
let attr = .item_attrs(def_id, self.session)
attrs.iter().find(|a| a.has_name(sym::rustc_legacy_const_generics))?; .into_iter()
let mut ret = vec![]; .find(|a| a.has_name(sym::rustc_legacy_const_generics))?;
for meta in attr.meta_item_list()? { let mut ret = Vec::new();
match meta.literal()?.kind { for meta in attr.meta_item_list()? {
LitKind::Int(a, _) => { match meta.literal()?.kind {
ret.push(a as usize); LitKind::Int(a, _) => ret.push(a as usize),
} _ => panic!("invalid arg index"),
_ => panic!("invalid arg index"),
}
} }
Some(ret) }
}; // Cache the lookup to avoid parsing attributes for an iterm multiple times.
self.legacy_const_generic_args.insert(def_id, Some(ret.clone()));
// Cache the lookup to avoid parsing attributes for an iterm return Some(ret);
// multiple times.
let ret = parse_attrs();
self.legacy_const_generic_args.insert(def_id, ret.clone());
return ret;
} }
} }
None None