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

Rename rust_2015 => is_rust_2015

Browse source
This commit is contained in:
Maybe Waffle 2023-02-01 10:42:20 +00:00
parent 131f0c6df6
commit 9fe8ae792e
11 changed files with 21 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

5
compiler/rustc_resolve/src/ident.rs
View file

@ -85,7 +85,7 @@ impl<'a> Resolver<'a> {
// 4c. Standard library prelude (de-facto closed, controlled).
// 6. Language prelude: builtin attributes (closed, controlled).
let rust_2015 = ctxt.edition().rust_2015();
let rust_2015 = ctxt.edition().is_rust_2015();
let (ns, macro_kind, is_absolute_path) = match scope_set {
ScopeSet::All(ns, _) => (ns, None, false),
ScopeSet::AbsolutePath(ns) => (ns, None, true),
@ -1397,7 +1397,8 @@ impl<'a> Resolver<'a> {
module = Some(ModuleOrUniformRoot::ExternPrelude);
continue;
}
if name == kw::PathRoot && ident.span.rust_2015() && self.session.rust_2018() {
if name == kw::PathRoot && ident.span.is_rust_2015() && self.session.rust_2018()
{
// `::a::b` from 2015 macro on 2018 global edition
module = Some(ModuleOrUniformRoot::CrateRootAndExternPrelude);
continue;