diff options
| author | bors <bors@rust-lang.org> | 2021-02-16 02:14:13 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-02-16 02:14:13 +0000 |
| commit | 42a4673fbd40b09a99d057eaa9b3e5579b54c184 (patch) | |
| tree | 5ab393dcc74c0ab38a4cdf58f513e8eb94bb9420 /compiler/rustc_span/src | |
| parent | d1206f950ffb76c76e1b74a19ae33c2b7d949454 (diff) | |
| parent | a105280a067891b557498cf9131843a75c20829a (diff) | |
| download | rust-42a4673fbd40b09a99d057eaa9b3e5579b54c184.tar.gz rust-42a4673fbd40b09a99d057eaa9b3e5579b54c184.zip | |
Auto merge of #82153 - jonas-schievink:rollup-ls5r943, r=jonas-schievink
Rollup of 19 pull requests
Successful merges:
- #81503 (Suggest to create a new `const` item if the `fn` in the array is a `const fn`)
- #81897 (Add match pattern diagnostics regression test)
- #81975 (Seal the CommandExt, OsStrExt and OsStringExt traits)
- #82009 (const_generics: Dont evaluate array length const when handling errors)
- #82060 (Fix typos in BTreeSet::{first, last} docs)
- #82061 (CTFE validation: catch ReadPointerAsBytes and better error)
- #82063 (Fixed minor typo in catch_unwind docs)
- #82067 (const_generics: Fix incorrect ty::ParamEnv::empty() usage)
- #82077 (Edit `rustc_arena::DropArena` docs)
- #82096 (Fix a typo)
- #82106 (Remove unnecessary `Option` in `default_doc`)
- #82107 (expand: Some cleanup)
- #82118 (Add missing env!-decl variant)
- #82119 (Fix typo in link to CreateSymbolicLinkW documentation.)
- #82120 (Stabilize Arguments::as_str)
- #82129 (Remove redundant bool_to_option feature gate)
- #82133 (Update link for extern prelude.)
- #82141 (32-bit ARM: Emit `lr` instead of `r14` when specified as an `asm!` output register.)
- #82147 (:arrow_up: rust-analyzer)
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_span/src')
| -rw-r--r-- | compiler/rustc_span/src/lib.rs | 9 | ||||
| -rw-r--r-- | compiler/rustc_span/src/symbol.rs | 1 |
2 files changed, 4 insertions, 6 deletions
diff --git a/compiler/rustc_span/src/lib.rs b/compiler/rustc_span/src/lib.rs index 79c5c7f110c..4b03d38ccba 100644 --- a/compiler/rustc_span/src/lib.rs +++ b/compiler/rustc_span/src/lib.rs @@ -510,11 +510,10 @@ impl Span { /// items can be used (that is, a macro marked with /// `#[allow_internal_unstable]`). pub fn allows_unstable(&self, feature: Symbol) -> bool { - self.ctxt().outer_expn_data().allow_internal_unstable.map_or(false, |features| { - features - .iter() - .any(|&f| f == feature || f == sym::allow_internal_unstable_backcompat_hack) - }) + self.ctxt() + .outer_expn_data() + .allow_internal_unstable + .map_or(false, |features| features.iter().any(|&f| f == feature)) } /// Checks if this span arises from a compiler desugaring of kind `kind`. diff --git a/compiler/rustc_span/src/symbol.rs b/compiler/rustc_span/src/symbol.rs index ef062da3f6e..8c90eeb7f3f 100644 --- a/compiler/rustc_span/src/symbol.rs +++ b/compiler/rustc_span/src/symbol.rs @@ -252,7 +252,6 @@ symbols! { allow_fail, allow_internal_unsafe, allow_internal_unstable, - allow_internal_unstable_backcompat_hack, allowed, always, and, |