about summary refs log tree commit diff
path: root/src/librustc_metadata
diff options
context:
space:
mode:
authorJeffrey Seyfried <jeffrey.seyfried@gmail.com>2016-11-15 04:34:52 +0000
committerJeffrey Seyfried <jeffrey.seyfried@gmail.com>2016-11-20 11:46:06 +0000
commita2626410d78c3b4bb9b7072b9ca1ee2ed7ce600f (patch)
tree61e0f8af79f0924bedcdccdbdf9d0699cde9beab /src/librustc_metadata
parentff4994235aa27b911422c8b4241c5d8f3d112d65 (diff)
downloadrust-a2626410d78c3b4bb9b7072b9ca1ee2ed7ce600f.tar.gz
rust-a2626410d78c3b4bb9b7072b9ca1ee2ed7ce600f.zip
Refactor `MetaItemKind` to use `Name`s instead of `InternedString`s.
Diffstat (limited to 'src/librustc_metadata')
-rw-r--r--src/librustc_metadata/creader.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/librustc_metadata/creader.rs b/src/librustc_metadata/creader.rs
index 5384535024e..525b8f8227b 100644
--- a/src/librustc_metadata/creader.rs
+++ b/src/librustc_metadata/creader.rs
@@ -37,7 +37,7 @@ use syntax::abi::Abi;
 use syntax::attr;
 use syntax::ext::base::SyntaxExtension;
 use syntax::feature_gate::{self, GateIssue};
-use syntax::parse::token::{InternedString, intern};
+use syntax::parse::token::{self, InternedString};
 use syntax_pos::{Span, DUMMY_SP};
 use log;
 
@@ -582,11 +582,11 @@ impl<'a> CrateLoader<'a> {
                                       trait_name: &str,
                                       expand: fn(TokenStream) -> TokenStream,
                                       attributes: &[&'static str]) {
-                let attrs = attributes.iter().map(|s| InternedString::new(s)).collect();
+                let attrs = attributes.iter().cloned().map(token::intern).collect();
                 let derive = SyntaxExtension::CustomDerive(
                     Box::new(CustomDerive::new(expand, attrs))
                 );
-                self.0.push((intern(trait_name), Rc::new(derive)));
+                self.0.push((token::intern(trait_name), Rc::new(derive)));
             }
         }