user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Eliminate Symbol::gensymed.

Browse source
This commit is contained in:
Nicholas Nethercote 2019-05-17 10:27:17 +10:00
parent f6637f3fcc
commit e57c0dbeb7
3 changed files with 7 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/libsyntax/std_inject.rs
View file

@ -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(

2
src/libsyntax_ext/test.rs
View file

@ -127,7 +127,7 @@ pub fn expand_test_or_bench(
])
};
let mut test_const = cx.item(sp, ast::Ident::new(item.ident.name.gensymed(), sp),
let mut test_const = cx.item(sp, ast::Ident::new(item.ident.name, sp).gensym(),
vec![
// #[cfg(test)]
cx.attribute(attr_sp, cx.meta_list(attr_sp, Symbol::intern("cfg"), vec![

7
src/libsyntax_pos/symbol.rs
View file

@ -677,7 +677,8 @@ impl Ident {
}
pub fn gensym(self) -> Ident {
Ident::new(self.name.gensymed(), self.span)
let name = with_interner(|interner| interner.gensymed(self.name));
Ident::new(name, self.span)
}
pub fn gensym_if_underscore(self) -> Ident {
@ -787,10 +788,6 @@ impl Symbol {
with_interner(|interner| interner.gensym(string))
}
pub fn gensymed(self) -> Self {
with_interner(|interner| interner.gensymed(self))
}
pub fn as_str(self) -> LocalInternedString {
with_interner(|interner| unsafe {
LocalInternedString {