From e57c0dbeb72cf631930429a20badd41290bb0608 Mon Sep 17 00:00:00 2001 From: Nicholas Nethercote Date: Fri, 17 May 2019 10:27:17 +1000 Subject: Eliminate `Symbol::gensymed`. --- src/libsyntax/std_inject.rs | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'src/libsyntax') diff --git a/src/libsyntax/std_inject.rs b/src/libsyntax/std_inject.rs index 6784a2abe55..fe8c9f03a2c 100644 --- a/src/libsyntax/std_inject.rs +++ b/src/libsyntax/std_inject.rs @@ -63,18 +63,13 @@ pub fn maybe_inject_crates_ref( // .rev() to preserve ordering above in combination with insert(0, ...) let alt_std_name = alt_std_name.map(Symbol::intern); - for orig_name in names.iter().rev() { - let orig_name = Symbol::intern(orig_name); - let mut rename = orig_name; + for orig_name_str in names.iter().rev() { // HACK(eddyb) gensym the injected crates on the Rust 2018 edition, // so they don't accidentally interfere with the new import paths. - if rust_2018 { - rename = orig_name.gensymed(); - } - let orig_name = if rename != orig_name { - Some(orig_name) + let (rename, orig_name) = if rust_2018 { + (Symbol::gensym(orig_name_str), Some(Symbol::intern(orig_name_str))) } else { - None + (Symbol::intern(orig_name_str), None) }; krate.module.items.insert(0, P(ast::Item { attrs: vec![attr::mk_attr_outer( -- cgit 1.4.1-3-g733a5