nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-06-05 03:38:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Pick the injected prelude based on the edition.

Browse Source
This commit is contained in:
Mara Bos 2021-02-17 13:34:58 +01:00
parent 1ab9fe5d44
commit d3b564c3d7
2 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
compiler/rustc_builtin_macros/src/standard_library_imports.rs
View File

@ -3,7 +3,7 @@ use rustc_ast::ptr::P;
use rustc_expand::base::{ExtCtxt, ResolverExpand}; use rustc_expand::base::{ExtCtxt, ResolverExpand};
use rustc_expand::expand::ExpansionConfig; use rustc_expand::expand::ExpansionConfig;
use rustc_session::Session; use rustc_session::Session;
use rustc_span::edition::Edition; use rustc_span::edition::Edition::*;
use rustc_span::hygiene::AstPass; use rustc_span::hygiene::AstPass;
use rustc_span::symbol::{kw, sym, Ident, Symbol}; use rustc_span::symbol::{kw, sym, Ident, Symbol};
use rustc_span::DUMMY_SP; use rustc_span::DUMMY_SP;
@ -14,7 +14,7 @@ pub fn inject(
sess: &Session, sess: &Session,
alt_std_name: Option<Symbol>, alt_std_name: Option<Symbol>,
) -> ast::Crate { ) -> ast::Crate {
let rust_2018 = sess.parse_sess.edition >= Edition::Edition2018; let edition = sess.parse_sess.edition;
// the first name in this list is the crate name of the crate with the prelude // the first name in this list is the crate name of the crate with the prelude
let names: &[Symbol] = if sess.contains_name(&krate.attrs, sym::no_core) { let names: &[Symbol] = if sess.contains_name(&krate.attrs, sym::no_core) {
@ -43,7 +43,11 @@ pub fn inject(
// .rev() to preserve ordering above in combination with insert(0, ...) // .rev() to preserve ordering above in combination with insert(0, ...)
for &name in names.iter().rev() { for &name in names.iter().rev() {
let ident = if rust_2018 { Ident::new(name, span) } else { Ident::new(name, call_site) }; let ident = if edition >= Edition2018 {
Ident::new(name, span)
} else {
Ident::new(name, call_site)
};
krate.items.insert( krate.items.insert(
0, 0,
cx.item( cx.item(
@ -59,14 +63,18 @@ pub fn inject(
// the one with the prelude. // the one with the prelude.
let name = names[0]; let name = names[0];
let import_path = if rust_2018 { let root = (edition == Edition2015).then(|| kw::PathRoot);
[name, sym::prelude, sym::v1].iter().map(|symbol| Ident::new(*symbol, span)).collect()
} else { let import_path = root
[kw::PathRoot, name, sym::prelude, sym::v1] .iter()
.iter() .chain(&[name, sym::prelude])
.map(|symbol| Ident::new(*symbol, span)) .chain(&[match edition {
.collect() Edition2015 => sym::rust_2015,
}; Edition2018 => sym::rust_2018,
Edition2021 => sym::rust_2021,
}])
.map(|&symbol| Ident::new(symbol, span))
.collect();
let use_item = cx.item( let use_item = cx.item(
span, span,

3
compiler/rustc_span/src/symbol.rs
View File

@ -944,8 +944,11 @@ symbols! {
rt, rt,
rtm_target_feature, rtm_target_feature,
rust, rust,
rust_2015,
rust_2015_preview, rust_2015_preview,
rust_2018,
rust_2018_preview, rust_2018_preview,
rust_2021,
rust_2021_preview, rust_2021_preview,
rust_begin_unwind, rust_begin_unwind,
rust_eh_catch_typeinfo, rust_eh_catch_typeinfo,