diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2014-05-29 19:03:06 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2014-06-05 13:55:11 -0700 |
| commit | 760b93adc0976121149105db19acf2ad5f631e5d (patch) | |
| tree | 6c20eba4139bfdd332187122315f7802367d7d6f /src/libsyntax/ext | |
| parent | 6a585375a01b7c6b52ad93f764220bcb18027ef6 (diff) | |
| download | rust-760b93adc0976121149105db19acf2ad5f631e5d.tar.gz rust-760b93adc0976121149105db19acf2ad5f631e5d.zip | |
Fallout from the libcollections movement
Diffstat (limited to 'src/libsyntax/ext')
| -rw-r--r-- | src/libsyntax/ext/base.rs | 2 | ||||
| -rw-r--r-- | src/libsyntax/ext/deriving/show.rs | 2 | ||||
| -rw-r--r-- | src/libsyntax/ext/format.rs | 2 | ||||
| -rw-r--r-- | src/libsyntax/ext/mtwt.rs | 5 | ||||
| -rw-r--r-- | src/libsyntax/ext/tt/macro_parser.rs | 2 | ||||
| -rw-r--r-- | src/libsyntax/ext/tt/transcribe.rs | 2 |
6 files changed, 7 insertions, 8 deletions
diff --git a/src/libsyntax/ext/base.rs b/src/libsyntax/ext/base.rs index e4c7fbb1deb..521b7ee0063 100644 --- a/src/libsyntax/ext/base.rs +++ b/src/libsyntax/ext/base.rs @@ -19,7 +19,7 @@ use parse::token; use parse::token::{InternedString, intern, str_to_ident}; use util::small_vector::SmallVector; -use collections::HashMap; +use std::collections::HashMap; // new-style macro! tt code: // diff --git a/src/libsyntax/ext/deriving/show.rs b/src/libsyntax/ext/deriving/show.rs index b352a702eec..1124cf6d7cb 100644 --- a/src/libsyntax/ext/deriving/show.rs +++ b/src/libsyntax/ext/deriving/show.rs @@ -18,7 +18,7 @@ use ext::deriving::generic::*; use ext::deriving::generic::ty::*; use parse::token; -use collections::HashMap; +use std::collections::HashMap; use std::string::String; pub fn expand_deriving_show(cx: &mut ExtCtxt, diff --git a/src/libsyntax/ext/format.rs b/src/libsyntax/ext/format.rs index 0d228a1146d..2db0d047942 100644 --- a/src/libsyntax/ext/format.rs +++ b/src/libsyntax/ext/format.rs @@ -19,7 +19,7 @@ use parse::token; use rsparse = parse; use parse = fmt_macros; -use collections::{HashMap, HashSet}; +use std::collections::{HashMap, HashSet}; #[deriving(PartialEq)] enum ArgumentType { diff --git a/src/libsyntax/ext/mtwt.rs b/src/libsyntax/ext/mtwt.rs index 12e314781ae..6c97a8aed1f 100644 --- a/src/libsyntax/ext/mtwt.rs +++ b/src/libsyntax/ext/mtwt.rs @@ -19,8 +19,7 @@ use ast::{Ident, Mrk, Name, SyntaxContext}; use std::cell::RefCell; use std::rc::Rc; - -use collections::HashMap; +use std::collections::HashMap; // the SCTable contains a table of SyntaxContext_'s. It // represents a flattened tree structure, to avoid having @@ -267,7 +266,7 @@ mod tests { use super::{resolve, xor_push, new_mark_internal, new_sctable_internal}; use super::{new_rename_internal, marksof_internal, resolve_internal}; use super::{SCTable, EmptyCtxt, Mark, Rename, IllegalCtxt}; - use collections::HashMap; + use std::collections::HashMap; #[test] fn xorpush_test () { diff --git a/src/libsyntax/ext/tt/macro_parser.rs b/src/libsyntax/ext/tt/macro_parser.rs index 65733793d6c..e74861f6efe 100644 --- a/src/libsyntax/ext/tt/macro_parser.rs +++ b/src/libsyntax/ext/tt/macro_parser.rs @@ -22,7 +22,7 @@ use parse::token::{Token, EOF, Nonterminal}; use parse::token; use std::rc::Rc; -use collections::HashMap; +use std::collections::HashMap; /* This is an Earley-like parser, without support for in-grammar nonterminals, only by calling out to the main rust parser for named nonterminals (which it diff --git a/src/libsyntax/ext/tt/transcribe.rs b/src/libsyntax/ext/tt/transcribe.rs index 4b0e2171062..748ba6b19da 100644 --- a/src/libsyntax/ext/tt/transcribe.rs +++ b/src/libsyntax/ext/tt/transcribe.rs @@ -18,7 +18,7 @@ use parse::token; use parse::lexer::TokenAndSpan; use std::rc::Rc; -use collections::HashMap; +use std::collections::HashMap; ///an unzipping of `TokenTree`s #[deriving(Clone)] |
