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

Auto merge of #58741 - varkor:lang-lib-feature-shared-name, r=alexreg

Browse source 
Allow lang and lib features to share names

Fixes https://github.com/rust-lang/rust/issues/58715.

I didn't add a test, because there's currently no standard lang test feature and I felt apprehensive about adding a permanently unstable feature. Instead, a shared lang/lib feature will be used in https://github.com/rust-lang/rust/pull/57760 and will essentially provide an immediately test.
This commit is contained in:
bors 2019-02-27 12:22:13 +00:00
commit 4855370740
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/librustc/middle/stability.rs
View file

@ -397,10 +397,14 @@ impl<'a, 'tcx> Index<'tcx> {
active_features: Default::default(),
};
let ref active_lib_features = tcx.features().declared_lib_features;
let active_lib_features = &tcx.features().declared_lib_features;
let active_lang_features = &tcx.features().declared_lang_features;
// Put the active features into a map for quick lookup
index.active_features = active_lib_features.iter().map(|&(ref s, _)| s.clone()).collect();
// Put the active features into a map for quick lookup.
index.active_features =
active_lib_features.iter().map(|&(ref s, ..)| s.clone())
.chain(active_lang_features.iter().map(|&(ref s, ..)| s.clone()))
.collect();
{
let krate = tcx.hir().krate();