From 56dcbd17fdad5d39b7b02e22a7490d2468718d08 Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Sat, 3 Jan 2015 22:42:21 -0500 Subject: [PATCH] sed -i -s 's/\bmod,/self,/g' **/*.rs --- src/grammar/verify.rs | 2 +- src/liballoc/arc.rs | 4 ++-- src/liballoc/boxed.rs | 2 +- src/liballoc/rc.rs | 8 ++++---- src/libcollections/binary_heap.rs | 2 +- src/libcollections/bit.rs | 2 +- src/libcollections/btree/map.rs | 6 +++--- src/libcollections/btree/set.rs | 2 +- src/libcollections/dlist.rs | 2 +- src/libcollections/ring_buf.rs | 2 +- src/libcollections/slice.rs | 6 +++--- src/libcollections/str.rs | 4 ++-- src/libcollections/string.rs | 4 ++-- src/libcollections/vec.rs | 2 +- src/libcore/cmp.rs | 2 +- src/libcore/fmt/float.rs | 4 ++-- src/libcore/fmt/mod.rs | 2 +- src/libcore/iter.rs | 2 +- src/libcore/ops.rs | 2 +- src/libcore/prelude.rs | 4 ++-- src/libcore/ptr.rs | 4 ++-- src/libcore/result.rs | 2 +- src/libcore/str/mod.rs | 8 ++++---- src/libregex/vm.rs | 2 +- src/librustc/lint/builtin.rs | 6 +++--- src/librustc/lint/context.rs | 2 +- src/librustc/metadata/decoder.rs | 2 +- src/librustc/metadata/encoder.rs | 4 ++-- src/librustc/metadata/tydecode.rs | 2 +- src/librustc/metadata/tyencode.rs | 2 +- src/librustc/middle/astconv_util.rs | 2 +- src/librustc/middle/astencode.rs | 2 +- src/librustc/middle/check_match.rs | 4 ++-- src/librustc/middle/const_eval.rs | 4 ++-- src/librustc/middle/dead.rs | 4 ++-- src/librustc/middle/effect.rs | 2 +- src/librustc/middle/fast_reject.rs | 2 +- src/librustc/middle/infer/coercion.rs | 2 +- src/librustc/middle/infer/combine.rs | 2 +- src/librustc/middle/infer/equate.rs | 2 +- src/librustc/middle/infer/error_reporting.rs | 2 +- src/librustc/middle/infer/freshen.rs | 4 ++-- src/librustc/middle/infer/glb.rs | 2 +- .../middle/infer/higher_ranked/mod.rs | 4 ++-- src/librustc/middle/infer/lattice.rs | 2 +- src/librustc/middle/infer/lub.rs | 2 +- src/librustc/middle/infer/mod.rs | 2 +- .../middle/infer/region_inference/graphviz.rs | 2 +- .../middle/infer/region_inference/mod.rs | 2 +- src/librustc/middle/infer/resolve.rs | 4 ++-- src/librustc/middle/infer/sub.rs | 2 +- src/librustc/middle/infer/type_variable.rs | 2 +- src/librustc/middle/infer/unify.rs | 2 +- src/librustc/middle/intrinsicck.rs | 2 +- src/librustc/middle/liveness.rs | 6 +++--- src/librustc/middle/mem_categorization.rs | 2 +- src/librustc/middle/privacy.rs | 4 ++-- src/librustc/middle/region.rs | 2 +- src/librustc/middle/resolve_lifetime.rs | 2 +- src/librustc/middle/subst.rs | 4 ++-- src/librustc/middle/traits/coherence.rs | 2 +- src/librustc/middle/traits/error_reporting.rs | 2 +- src/librustc/middle/traits/fulfill.rs | 2 +- src/librustc/middle/traits/mod.rs | 2 +- src/librustc/middle/traits/object_safety.rs | 4 ++-- src/librustc/middle/traits/project.rs | 4 ++-- src/librustc/middle/traits/select.rs | 2 +- src/librustc/middle/traits/util.rs | 2 +- src/librustc/middle/ty.rs | 16 +++++++-------- src/librustc/middle/ty_fold.rs | 2 +- src/librustc/middle/ty_walk.rs | 2 +- src/librustc/session/mod.rs | 2 +- src/librustc_borrowck/borrowck/mod.rs | 2 +- src/librustc_driver/driver.rs | 2 +- src/librustc_driver/pretty.rs | 8 ++++---- src/librustc_driver/test.rs | 6 +++--- src/librustc_resolve/build_reduced_graph.rs | 10 +++++----- src/librustc_resolve/check_unused.rs | 2 +- src/librustc_resolve/lib.rs | 4 ++-- src/librustc_resolve/record_exports.rs | 2 +- src/librustc_trans/back/link.rs | 2 +- src/librustc_trans/back/lto.rs | 2 +- src/librustc_trans/save/mod.rs | 12 +++++------ src/librustc_trans/trans/_match.rs | 8 ++++---- src/librustc_trans/trans/adt.rs | 2 +- src/librustc_trans/trans/base.rs | 4 ++-- src/librustc_trans/trans/callee.rs | 2 +- src/librustc_trans/trans/cleanup.rs | 2 +- src/librustc_trans/trans/closure.rs | 4 ++-- src/librustc_trans/trans/common.rs | 4 ++-- src/librustc_trans/trans/consts.rs | 4 ++-- src/librustc_trans/trans/context.rs | 2 +- src/librustc_trans/trans/datum.rs | 2 +- src/librustc_trans/trans/debuginfo.rs | 10 +++++----- src/librustc_trans/trans/expr.rs | 8 ++++---- src/librustc_trans/trans/foreign.rs | 2 +- src/librustc_trans/trans/glue.rs | 2 +- src/librustc_trans/trans/intrinsic.rs | 2 +- src/librustc_trans/trans/meth.rs | 4 ++-- src/librustc_trans/trans/monomorphize.rs | 2 +- src/librustc_trans/trans/tvec.rs | 2 +- src/librustc_trans/trans/type_of.rs | 2 +- src/librustc_typeck/astconv.rs | 6 +++--- src/librustc_typeck/check/_match.rs | 2 +- src/librustc_typeck/check/assoc.rs | 4 ++-- src/librustc_typeck/check/closure.rs | 2 +- src/librustc_typeck/check/demand.rs | 2 +- src/librustc_typeck/check/method/confirm.rs | 4 ++-- src/librustc_typeck/check/method/probe.rs | 2 +- src/librustc_typeck/check/mod.rs | 20 +++++++++---------- src/librustc_typeck/check/regionck.rs | 2 +- src/librustc_typeck/check/regionmanip.rs | 2 +- src/librustc_typeck/check/upvar.rs | 2 +- src/librustc_typeck/check/vtable.rs | 4 ++-- src/librustc_typeck/check/wf.rs | 2 +- src/librustc_typeck/check/writeback.rs | 2 +- src/librustc_typeck/coherence/mod.rs | 2 +- src/librustc_typeck/coherence/overlap.rs | 2 +- src/librustc_typeck/collect.rs | 6 +++--- src/librustc_typeck/lib.rs | 2 +- src/librustc_typeck/variance.rs | 2 +- src/librustdoc/clean/mod.rs | 4 ++-- src/librustdoc/core.rs | 2 +- src/librustdoc/html/render.rs | 2 +- src/librustdoc/lib.rs | 2 +- src/librustdoc/test.rs | 2 +- src/libserialize/json.rs | 4 ++-- src/libstd/c_str.rs | 2 +- src/libstd/collections/hash/map.rs | 8 ++++---- src/libstd/collections/hash/set.rs | 2 +- src/libstd/io/mem.rs | 2 +- src/libstd/io/net/ip.rs | 2 +- src/libstd/num/strconv.rs | 4 ++-- src/libstd/path/posix.rs | 4 ++-- src/libstd/path/windows.rs | 2 +- src/libstd/prelude/v1.rs | 4 ++-- src/libstd/rt/mod.rs | 2 +- src/libstd/rt/util.rs | 2 +- src/libstd/sync/atomic.rs | 2 +- src/libstd/sync/condvar.rs | 4 ++-- src/libstd/sync/mpsc/oneshot.rs | 2 +- src/libstd/sync/mpsc/select.rs | 2 +- src/libstd/sync/mpsc/shared.rs | 2 +- src/libstd/sync/mpsc/stream.rs | 2 +- src/libstd/sync/mpsc/sync.rs | 4 ++-- src/libstd/sync/mutex.rs | 2 +- src/libstd/sync/rwlock.rs | 4 ++-- src/libstd/sys/common/condvar.rs | 2 +- src/libstd/sys/common/mod.rs | 2 +- src/libstd/sys/common/net.rs | 8 ++++---- src/libstd/sys/common/thread_local.rs | 2 +- src/libstd/sys/unix/backtrace.rs | 2 +- src/libstd/sys/unix/condvar.rs | 2 +- src/libstd/sys/unix/fs.rs | 2 +- src/libstd/sys/unix/mod.rs | 2 +- src/libstd/sys/unix/os.rs | 2 +- src/libstd/sys/unix/pipe.rs | 4 ++-- src/libstd/sys/unix/process.rs | 6 +++--- src/libstd/sys/unix/tty.rs | 4 ++-- src/libstd/sys/windows/condvar.rs | 4 ++-- src/libstd/sys/windows/fs.rs | 2 +- src/libstd/sys/windows/helper_signal.rs | 2 +- src/libstd/sys/windows/mod.rs | 2 +- src/libstd/sys/windows/mutex.rs | 2 +- src/libstd/sys/windows/pipe.rs | 4 ++-- src/libstd/sys/windows/process.rs | 2 +- src/libstd/sys/windows/tcp.rs | 4 ++-- src/libstd/sys/windows/tty.rs | 2 +- src/libstd/thread.rs | 4 ++-- src/libsyntax/ast_map/mod.rs | 4 ++-- src/libsyntax/ext/deriving/generic/mod.rs | 2 +- src/libsyntax/parse/parser.rs | 6 +++--- src/libsyntax/print/pprust.rs | 10 +++++----- src/libsyntax/ptr.rs | 2 +- src/libtest/lib.rs | 2 +- src/libtest/stats.rs | 2 +- src/libtime/lib.rs | 2 +- src/test/bench/shootout-k-nucleotide-pipes.rs | 2 +- 178 files changed, 291 insertions(+), 291 deletions(-) diff --git a/src/grammar/verify.rs b/src/grammar/verify.rs index bdb616fcc99..56e1736196e 100644 --- a/src/grammar/verify.rs +++ b/src/grammar/verify.rs @@ -26,7 +26,7 @@ use std::io::File; use syntax::parse; use syntax::parse::lexer; -use rustc::session::{mod, config}; +use rustc::session::{self, config}; use syntax::ast; use syntax::ast::Name; diff --git a/src/liballoc/arc.rs b/src/liballoc/arc.rs index 59106aa9777..e00f4c45017 100644 --- a/src/liballoc/arc.rs +++ b/src/liballoc/arc.rs @@ -71,7 +71,7 @@ use core::atomic; use core::atomic::Ordering::{Relaxed, Release, Acquire, SeqCst}; use core::borrow::BorrowFrom; use core::clone::Clone; -use core::fmt::{mod, Show}; +use core::fmt::{self, Show}; use core::cmp::{Eq, Ord, PartialEq, PartialOrd, Ordering}; use core::default::Default; use core::kinds::{Sync, Send}; @@ -81,7 +81,7 @@ use core::nonzero::NonZero; use core::ops::{Drop, Deref}; use core::option::Option; use core::option::Option::{Some, None}; -use core::ptr::{mod, PtrExt}; +use core::ptr::{self, PtrExt}; use heap::deallocate; /// An atomically reference counted wrapper for shared state. diff --git a/src/liballoc/boxed.rs b/src/liballoc/boxed.rs index e836b08459b..362f6c66b59 100644 --- a/src/liballoc/boxed.rs +++ b/src/liballoc/boxed.rs @@ -17,7 +17,7 @@ use core::clone::Clone; use core::cmp::{PartialEq, PartialOrd, Eq, Ord, Ordering}; use core::default::Default; use core::fmt; -use core::hash::{mod, Hash}; +use core::hash::{self, Hash}; use core::kinds::Sized; use core::mem; use core::option::Option; diff --git a/src/liballoc/rc.rs b/src/liballoc/rc.rs index c57231fc434..c4b455aff5c 100644 --- a/src/liballoc/rc.rs +++ b/src/liballoc/rc.rs @@ -147,14 +147,14 @@ use core::clone::Clone; use core::cmp::{PartialEq, PartialOrd, Eq, Ord, Ordering}; use core::default::Default; use core::fmt; -use core::hash::{mod, Hash}; +use core::hash::{self, Hash}; use core::kinds::marker; use core::mem::{transmute, min_align_of, size_of, forget}; use core::nonzero::NonZero; use core::ops::{Deref, Drop}; use core::option::Option; use core::option::Option::{Some, None}; -use core::ptr::{mod, PtrExt}; +use core::ptr::{self, PtrExt}; use core::result::Result; use core::result::Result::{Ok, Err}; @@ -264,7 +264,7 @@ pub fn is_unique(rc: &Rc) -> bool { /// # Example /// /// ``` -/// use std::rc::{mod, Rc}; +/// use std::rc::{self, Rc}; /// /// let x = Rc::new(3u); /// assert_eq!(rc::try_unwrap(x), Ok(3u)); @@ -298,7 +298,7 @@ pub fn try_unwrap(rc: Rc) -> Result> { /// # Example /// /// ``` -/// use std::rc::{mod, Rc}; +/// use std::rc::{self, Rc}; /// /// let mut x = Rc::new(3u); /// *rc::get_mut(&mut x).unwrap() = 4u; diff --git a/src/libcollections/binary_heap.rs b/src/libcollections/binary_heap.rs index da461ae2d4d..b561df56cb8 100644 --- a/src/libcollections/binary_heap.rs +++ b/src/libcollections/binary_heap.rs @@ -157,7 +157,7 @@ use core::mem::{zeroed, replace, swap}; use core::ptr; use slice; -use vec::{mod, Vec}; +use vec::{self, Vec}; /// A priority queue implemented with a binary heap. /// diff --git a/src/libcollections/bit.rs b/src/libcollections/bit.rs index 9674885c857..922c8bbad19 100644 --- a/src/libcollections/bit.rs +++ b/src/libcollections/bit.rs @@ -89,7 +89,7 @@ use core::fmt; use core::hash; use core::iter::RandomAccessIterator; use core::iter::{Chain, Enumerate, Repeat, Skip, Take, repeat, Cloned}; -use core::iter::{mod, FromIterator}; +use core::iter::{self, FromIterator}; use core::num::Int; use core::ops::Index; use core::slice; diff --git a/src/libcollections/btree/map.rs b/src/libcollections/btree/map.rs index e86e9326665..24ba63a5001 100644 --- a/src/libcollections/btree/map.rs +++ b/src/libcollections/btree/map.rs @@ -33,9 +33,9 @@ use ring_buf::RingBuf; use self::Continuation::{Continue, Finished}; use self::StackOp::*; use super::node::ForceResult::{Leaf, Internal}; -use super::node::TraversalItem::{mod, Elem, Edge}; +use super::node::TraversalItem::{self, Elem, Edge}; use super::node::{Traversal, MutTraversal, MoveTraversal}; -use super::node::{mod, Node, Found, GoDown}; +use super::node::{self, Node, Found, GoDown}; // FIXME(conventions): implement bounded iterators @@ -505,7 +505,7 @@ mod stack { use core::mem; use core::ops::{Deref, DerefMut}; use super::BTreeMap; - use super::super::node::{mod, Node, Fit, Split, Internal, Leaf}; + use super::super::node::{self, Node, Fit, Split, Internal, Leaf}; use super::super::node::handle; use vec::Vec; diff --git a/src/libcollections/btree/set.rs b/src/libcollections/btree/set.rs index a2899f76dad..623cf080539 100644 --- a/src/libcollections/btree/set.rs +++ b/src/libcollections/btree/set.rs @@ -14,7 +14,7 @@ use core::prelude::*; use core::borrow::BorrowFrom; -use core::cmp::Ordering::{mod, Less, Greater, Equal}; +use core::cmp::Ordering::{self, Less, Greater, Equal}; use core::default::Default; use core::fmt::Show; use core::fmt; diff --git a/src/libcollections/dlist.rs b/src/libcollections/dlist.rs index b3d61f44563..9bd9d34a443 100644 --- a/src/libcollections/dlist.rs +++ b/src/libcollections/dlist.rs @@ -26,7 +26,7 @@ use core::cmp::Ordering; use core::default::Default; use core::fmt; use core::hash::{Writer, Hash}; -use core::iter::{mod, FromIterator}; +use core::iter::{self, FromIterator}; use core::mem; use core::ptr; diff --git a/src/libcollections/ring_buf.rs b/src/libcollections/ring_buf.rs index dd78ae03c5a..e46297b5e56 100644 --- a/src/libcollections/ring_buf.rs +++ b/src/libcollections/ring_buf.rs @@ -17,7 +17,7 @@ use core::prelude::*; use core::cmp::Ordering; use core::default::Default; use core::fmt; -use core::iter::{mod, FromIterator, RandomAccessIterator}; +use core::iter::{self, FromIterator, RandomAccessIterator}; use core::kinds::marker; use core::mem; use core::num::{Int, UnsignedInt}; diff --git a/src/libcollections/slice.rs b/src/libcollections/slice.rs index 5db4e8580d0..12e0feae2d9 100644 --- a/src/libcollections/slice.rs +++ b/src/libcollections/slice.rs @@ -90,15 +90,15 @@ use alloc::boxed::Box; use core::borrow::{BorrowFrom, BorrowFromMut, ToOwned}; use core::clone::Clone; -use core::cmp::Ordering::{mod, Greater, Less}; -use core::cmp::{mod, Ord, PartialEq}; +use core::cmp::Ordering::{self, Greater, Less}; +use core::cmp::{self, Ord, PartialEq}; use core::iter::{Iterator, IteratorExt, IteratorCloneExt}; use core::iter::{range, range_step, MultiplicativeIterator}; use core::kinds::Sized; use core::mem::size_of; use core::mem; use core::ops::{FnMut, SliceMut}; -use core::option::Option::{mod, Some, None}; +use core::option::Option::{self, Some, None}; use core::ptr::PtrExt; use core::ptr; use core::result::Result; diff --git a/src/libcollections/str.rs b/src/libcollections/str.rs index 6c51480931b..1c3c14f6d90 100644 --- a/src/libcollections/str.rs +++ b/src/libcollections/str.rs @@ -64,10 +64,10 @@ use core::default::Default; use core::fmt; use core::hash; use core::iter::AdditiveIterator; -use core::iter::{mod, range, Iterator, IteratorExt}; +use core::iter::{self, range, Iterator, IteratorExt}; use core::kinds::Sized; use core::ops; -use core::option::Option::{mod, Some, None}; +use core::option::Option::{self, Some, None}; use core::slice::AsSlice; use core::str as core_str; use unicode::str::{UnicodeStr, Utf16Encoder}; diff --git a/src/libcollections/string.rs b/src/libcollections/string.rs index 35fa3fb55de..599f1caa665 100644 --- a/src/libcollections/string.rs +++ b/src/libcollections/string.rs @@ -23,13 +23,13 @@ use core::fmt; use core::hash; use core::iter::FromIterator; use core::mem; -use core::ops::{mod, Deref, Add}; +use core::ops::{self, Deref, Add}; use core::ptr; use core::raw::Slice as RawSlice; use unicode::str as unicode_str; use unicode::str::Utf16Item; -use str::{mod, CharRange, FromStr, Utf8Error}; +use str::{self, CharRange, FromStr, Utf8Error}; use vec::{DerefVec, Vec, as_vec}; /// A growable string stored as a UTF-8 encoded buffer. diff --git a/src/libcollections/vec.rs b/src/libcollections/vec.rs index 07338801872..03870274b71 100644 --- a/src/libcollections/vec.rs +++ b/src/libcollections/vec.rs @@ -53,7 +53,7 @@ use core::cmp::max; use core::cmp::{Equiv, Ordering}; use core::default::Default; use core::fmt; -use core::hash::{mod, Hash}; +use core::hash::{self, Hash}; use core::iter::{repeat, FromIterator}; use core::kinds::marker::{ContravariantLifetime, InvariantType}; use core::mem; diff --git a/src/libcore/cmp.rs b/src/libcore/cmp.rs index 38906892a33..203b6fb38b1 100644 --- a/src/libcore/cmp.rs +++ b/src/libcore/cmp.rs @@ -44,7 +44,7 @@ use self::Ordering::*; use kinds::Sized; -use option::Option::{mod, Some, None}; +use option::Option::{self, Some, None}; /// Trait for equality comparisons which are [partial equivalence relations]( /// http://en.wikipedia.org/wiki/Partial_equivalence_relation). diff --git a/src/libcore/fmt/float.rs b/src/libcore/fmt/float.rs index 27023fab858..9e62226220c 100644 --- a/src/libcore/fmt/float.rs +++ b/src/libcore/fmt/float.rs @@ -22,8 +22,8 @@ use num::{cast, Float, ToPrimitive}; use num::FpCategory as Fp; use ops::FnOnce; use result::Result::Ok; -use slice::{mod, SliceExt}; -use str::{mod, StrExt}; +use slice::{self, SliceExt}; +use str::{self, StrExt}; /// A flag that specifies whether to use exponential (scientific) notation. pub enum ExponentFormat { diff --git a/src/libcore/fmt/mod.rs b/src/libcore/fmt/mod.rs index 13fbf5232f8..149f61225a5 100644 --- a/src/libcore/fmt/mod.rs +++ b/src/libcore/fmt/mod.rs @@ -24,7 +24,7 @@ use result::Result::{Ok, Err}; use result; use slice::SliceExt; use slice; -use str::{mod, StrExt, Utf8Error}; +use str::{self, StrExt, Utf8Error}; pub use self::num::radix; pub use self::num::Radix; diff --git a/src/libcore/iter.rs b/src/libcore/iter.rs index f65857b37fb..ca3cf7aec2f 100644 --- a/src/libcore/iter.rs +++ b/src/libcore/iter.rs @@ -1176,7 +1176,7 @@ impl MinMaxResult { /// # Example /// /// ```rust - /// use std::iter::MinMaxResult::{mod, NoElements, OneElement, MinMax}; + /// use std::iter::MinMaxResult::{self, NoElements, OneElement, MinMax}; /// /// let r: MinMaxResult = NoElements; /// assert_eq!(r.into_option(), None); diff --git a/src/libcore/ops.rs b/src/libcore/ops.rs index bef91dbd760..7a689bec6cf 100644 --- a/src/libcore/ops.rs +++ b/src/libcore/ops.rs @@ -62,7 +62,7 @@ use clone::Clone; use iter::{Step, Iterator,DoubleEndedIterator,ExactSizeIterator}; use kinds::Sized; -use option::Option::{mod, Some, None}; +use option::Option::{self, Some, None}; /// The `Drop` trait is used to run some code when a value goes out of scope. This /// is sometimes called a 'destructor'. diff --git a/src/libcore/prelude.rs b/src/libcore/prelude.rs index 1355825e56d..64f13a8f123 100644 --- a/src/libcore/prelude.rs +++ b/src/libcore/prelude.rs @@ -45,8 +45,8 @@ pub use iter::{Extend, IteratorExt}; pub use iter::{Iterator, DoubleEndedIterator}; pub use iter::{IteratorCloneExt, CloneIteratorExt}; pub use iter::{IteratorOrdExt, ExactSizeIterator}; -pub use option::Option::{mod, Some, None}; +pub use option::Option::{self, Some, None}; pub use ptr::{PtrExt, MutPtrExt}; -pub use result::Result::{mod, Ok, Err}; +pub use result::Result::{self, Ok, Err}; pub use slice::{AsSlice, SliceExt}; pub use str::{Str, StrExt}; diff --git a/src/libcore/ptr.rs b/src/libcore/ptr.rs index f29d7518149..9aed78d0737 100644 --- a/src/libcore/ptr.rs +++ b/src/libcore/ptr.rs @@ -91,11 +91,11 @@ use mem; use clone::Clone; use intrinsics; -use option::Option::{mod, Some, None}; +use option::Option::{self, Some, None}; use kinds::{Send, Sized, Sync}; use cmp::{PartialEq, Eq, Ord, PartialOrd, Equiv}; -use cmp::Ordering::{mod, Less, Equal, Greater}; +use cmp::Ordering::{self, Less, Equal, Greater}; // FIXME #19649: instrinsic docs don't render, so these have no docs :( diff --git a/src/libcore/result.rs b/src/libcore/result.rs index b0ee5672e06..71d62f021a9 100644 --- a/src/libcore/result.rs +++ b/src/libcore/result.rs @@ -236,7 +236,7 @@ use clone::Clone; use fmt::Show; use iter::{Iterator, IteratorExt, DoubleEndedIterator, FromIterator, ExactSizeIterator}; use ops::{FnMut, FnOnce}; -use option::Option::{mod, None, Some}; +use option::Option::{self, None, Some}; use slice::AsSlice; use slice; diff --git a/src/libcore/str/mod.rs b/src/libcore/str/mod.rs index 7e99e423608..6744e2d851f 100644 --- a/src/libcore/str/mod.rs +++ b/src/libcore/str/mod.rs @@ -18,7 +18,7 @@ use self::Searcher::{Naive, TwoWay, TwoWayLong}; -use cmp::{mod, Eq}; +use cmp::{self, Eq}; use default::Default; use iter::range; use iter::ExactSizeIterator; @@ -27,11 +27,11 @@ use kinds::Sized; use mem; use num::Int; use ops::{Fn, FnMut}; -use option::Option::{mod, None, Some}; +use option::Option::{self, None, Some}; use ptr::PtrExt; use raw::{Repr, Slice}; -use result::Result::{mod, Ok, Err}; -use slice::{mod, SliceExt}; +use result::Result::{self, Ok, Err}; +use slice::{self, SliceExt}; use uint; macro_rules! delegate_iter { diff --git a/src/libregex/vm.rs b/src/libregex/vm.rs index 603ca57d15d..79efebc6404 100644 --- a/src/libregex/vm.rs +++ b/src/libregex/vm.rs @@ -37,7 +37,7 @@ pub use self::MatchKind::*; pub use self::StepState::*; use std::cmp; -use std::cmp::Ordering::{mod, Less, Equal, Greater}; +use std::cmp::Ordering::{self, Less, Equal, Greater}; use std::mem; use std::iter::repeat; use std::slice::SliceExt; diff --git a/src/librustc/lint/builtin.rs b/src/librustc/lint/builtin.rs index 53249c72462..382b889ed21 100644 --- a/src/librustc/lint/builtin.rs +++ b/src/librustc/lint/builtin.rs @@ -29,7 +29,7 @@ use self::MethodContext::*; use metadata::csearch; use middle::def::*; use middle::subst::Substs; -use middle::ty::{mod, Ty}; +use middle::ty::{self, Ty}; use middle::{def, pat_util, stability}; use middle::const_eval::{eval_const_expr_partial, const_int, const_uint}; use util::ppaux::{ty_to_string}; @@ -43,13 +43,13 @@ use std::{i8, i16, i32, i64, u8, u16, u32, u64, f32, f64}; use syntax::{abi, ast, ast_map}; use syntax::ast_util::is_shift_binop; -use syntax::attr::{mod, AttrMetaMethods}; +use syntax::attr::{self, AttrMetaMethods}; use syntax::codemap::{Span, DUMMY_SP}; use syntax::parse::token; use syntax::ast::{TyI, TyU, TyI8, TyU8, TyI16, TyU16, TyI32, TyU32, TyI64, TyU64}; use syntax::ast_util; use syntax::ptr::P; -use syntax::visit::{mod, Visitor}; +use syntax::visit::{self, Visitor}; declare_lint! { WHILE_TRUE, diff --git a/src/librustc/lint/context.rs b/src/librustc/lint/context.rs index ffae485364a..69e5b4889c2 100644 --- a/src/librustc/lint/context.rs +++ b/src/librustc/lint/context.rs @@ -26,7 +26,7 @@ use self::TargetLint::*; use middle::privacy::ExportedItems; -use middle::ty::{mod, Ty}; +use middle::ty::{self, Ty}; use session::{early_error, Session}; use lint::{Level, LevelSource, Lint, LintId, LintArray, LintPass, LintPassObject}; use lint::{Default, CommandLine, Node, Allow, Warn, Deny, Forbid}; diff --git a/src/librustc/metadata/decoder.rs b/src/librustc/metadata/decoder.rs index a25b6d8b8fa..3ae9525e4b5 100644 --- a/src/librustc/metadata/decoder.rs +++ b/src/librustc/metadata/decoder.rs @@ -29,7 +29,7 @@ use middle::def; use middle::lang_items; use middle::subst; use middle::ty::{ImplContainer, TraitContainer}; -use middle::ty::{mod, Ty}; +use middle::ty::{self, Ty}; use middle::astencode::vtable_decoder_helpers; use std::collections::HashMap; diff --git a/src/librustc/metadata/encoder.rs b/src/librustc/metadata/encoder.rs index 17663a127a8..fd2650939cd 100644 --- a/src/librustc/metadata/encoder.rs +++ b/src/librustc/metadata/encoder.rs @@ -23,7 +23,7 @@ use metadata::decoder; use metadata::tyencode; use middle::def; use middle::ty::{lookup_item_type}; -use middle::ty::{mod, Ty}; +use middle::ty::{self, Ty}; use middle::stability; use util::nodemap::{FnvHashMap, NodeMap, NodeSet}; @@ -32,7 +32,7 @@ use std::cell::RefCell; use std::hash::Hash; use std::hash; use syntax::abi; -use syntax::ast::{mod, DefId, NodeId}; +use syntax::ast::{self, DefId, NodeId}; use syntax::ast_map::{PathElem, PathElems}; use syntax::ast_map; use syntax::ast_util::*; diff --git a/src/librustc/metadata/tydecode.rs b/src/librustc/metadata/tydecode.rs index 2d3ff95ffa6..066bc6d0932 100644 --- a/src/librustc/metadata/tydecode.rs +++ b/src/librustc/metadata/tydecode.rs @@ -21,7 +21,7 @@ pub use self::DefIdSource::*; use middle::region; use middle::subst; use middle::subst::VecPerParamSpace; -use middle::ty::{mod, AsPredicate, Ty}; +use middle::ty::{self, AsPredicate, Ty}; use std::rc::Rc; use std::str; diff --git a/src/librustc/metadata/tyencode.rs b/src/librustc/metadata/tyencode.rs index 30746f51a8f..5f0f51ce903 100644 --- a/src/librustc/metadata/tyencode.rs +++ b/src/librustc/metadata/tyencode.rs @@ -19,7 +19,7 @@ use middle::region; use middle::subst; use middle::subst::VecPerParamSpace; use middle::ty::ParamTy; -use middle::ty::{mod, Ty}; +use middle::ty::{self, Ty}; use util::nodemap::FnvHashMap; use syntax::abi::Abi; diff --git a/src/librustc/middle/astconv_util.rs b/src/librustc/middle/astconv_util.rs index b1b4fd831a0..b2ad7746727 100644 --- a/src/librustc/middle/astconv_util.rs +++ b/src/librustc/middle/astconv_util.rs @@ -15,7 +15,7 @@ */ use middle::def; -use middle::ty::{mod, Ty}; +use middle::ty::{self, Ty}; use syntax::ast; use util::ppaux::Repr; diff --git a/src/librustc/middle/astencode.rs b/src/librustc/middle/astencode.rs index 6efc80ed8d3..e4d407d66a2 100644 --- a/src/librustc/middle/astencode.rs +++ b/src/librustc/middle/astencode.rs @@ -26,7 +26,7 @@ use metadata::tyencode; use middle::mem_categorization::Typer; use middle::subst; use middle::subst::VecPerParamSpace; -use middle::ty::{mod, Ty, MethodCall, MethodCallee, MethodOrigin}; +use middle::ty::{self, Ty, MethodCall, MethodCallee, MethodOrigin}; use util::ppaux::ty_to_string; use syntax::{ast, ast_map, ast_util, codemap, fold}; diff --git a/src/librustc/middle/check_match.rs b/src/librustc/middle/check_match.rs index 74f25332ecf..64cfd293ee4 100644 --- a/src/librustc/middle/check_match.rs +++ b/src/librustc/middle/check_match.rs @@ -27,14 +27,14 @@ use std::fmt; use std::iter::{range_inclusive, AdditiveIterator, FromIterator, repeat}; use std::num::Float; use std::slice; -use syntax::ast::{mod, DUMMY_NODE_ID, NodeId, Pat}; +use syntax::ast::{self, DUMMY_NODE_ID, NodeId, Pat}; use syntax::ast_util::walk_pat; use syntax::codemap::{Span, Spanned, DUMMY_SP}; use syntax::fold::{Folder, noop_fold_pat}; use syntax::print::pprust::pat_to_string; use syntax::parse::token; use syntax::ptr::P; -use syntax::visit::{mod, Visitor, FnKind}; +use syntax::visit::{self, Visitor, FnKind}; use util::ppaux::ty_to_string; pub const DUMMY_WILD_PAT: &'static Pat = &Pat { diff --git a/src/librustc/middle/const_eval.rs b/src/librustc/middle/const_eval.rs index 96b2a62326b..03f1bc1cd7b 100644 --- a/src/librustc/middle/const_eval.rs +++ b/src/librustc/middle/const_eval.rs @@ -21,10 +21,10 @@ use middle::ty::{mod}; use middle::astconv_util::{ast_ty_to_prim_ty}; use util::nodemap::DefIdMap; -use syntax::ast::{mod, Expr}; +use syntax::ast::{self, Expr}; use syntax::parse::token::InternedString; use syntax::ptr::P; -use syntax::visit::{mod, Visitor}; +use syntax::visit::{self, Visitor}; use syntax::{ast_map, ast_util, codemap}; use std::collections::hash_map::Entry::Vacant; diff --git a/src/librustc/middle/dead.rs b/src/librustc/middle/dead.rs index 939775e7507..5a2085bee24 100644 --- a/src/librustc/middle/dead.rs +++ b/src/librustc/middle/dead.rs @@ -19,8 +19,8 @@ use util::nodemap::NodeSet; use std::collections::HashSet; use syntax::{ast, ast_map, codemap}; use syntax::ast_util::{local_def, is_local, PostExpansionMethod}; -use syntax::attr::{mod, AttrMetaMethods}; -use syntax::visit::{mod, Visitor}; +use syntax::attr::{self, AttrMetaMethods}; +use syntax::visit::{self, Visitor}; // Any local node that may call something in its body block should be // explored. For example, if it's a live NodeItem that is a diff --git a/src/librustc/middle/effect.rs b/src/librustc/middle/effect.rs index 52899aaba41..927275c7389 100644 --- a/src/librustc/middle/effect.rs +++ b/src/librustc/middle/effect.rs @@ -13,7 +13,7 @@ use self::UnsafeContext::*; use middle::def; -use middle::ty::{mod, Ty}; +use middle::ty::{self, Ty}; use middle::ty::MethodCall; use util::ppaux; diff --git a/src/librustc/middle/fast_reject.rs b/src/librustc/middle/fast_reject.rs index dcbd94b8482..40b8e60d296 100644 --- a/src/librustc/middle/fast_reject.rs +++ b/src/librustc/middle/fast_reject.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -use middle::ty::{mod, Ty}; +use middle::ty::{self, Ty}; use syntax::ast; use self::SimplifiedType::*; diff --git a/src/librustc/middle/infer/coercion.rs b/src/librustc/middle/infer/coercion.rs index 11ca202971e..f6f62e03590 100644 --- a/src/librustc/middle/infer/coercion.rs +++ b/src/librustc/middle/infer/coercion.rs @@ -67,7 +67,7 @@ use super::sub::Sub; use middle::subst; use middle::ty::{AutoPtr, AutoDerefRef, AdjustDerefRef, AutoUnsize, AutoUnsafe}; use middle::ty::{mt}; -use middle::ty::{mod, Ty}; +use middle::ty::{self, Ty}; use util::ppaux; use util::ppaux::Repr; diff --git a/src/librustc/middle/infer/combine.rs b/src/librustc/middle/infer/combine.rs index ab6f6b601f6..f7d7fc81e0d 100644 --- a/src/librustc/middle/infer/combine.rs +++ b/src/librustc/middle/infer/combine.rs @@ -46,7 +46,7 @@ use middle::subst::{ErasedRegions, NonerasedRegions, Substs}; use middle::ty::{FloatVar, FnSig, IntVar, TyVar}; use middle::ty::{IntType, UintType}; use middle::ty::{BuiltinBounds}; -use middle::ty::{mod, Ty}; +use middle::ty::{self, Ty}; use middle::ty_fold; use middle::ty_fold::{TypeFoldable}; use util::ppaux::Repr; diff --git a/src/librustc/middle/infer/equate.rs b/src/librustc/middle/infer/equate.rs index 2a4d20f4dd3..f6ac7461567 100644 --- a/src/librustc/middle/infer/equate.rs +++ b/src/librustc/middle/infer/equate.rs @@ -9,7 +9,7 @@ // except according to those terms. use middle::ty::{BuiltinBounds}; -use middle::ty::{mod, Ty}; +use middle::ty::{self, Ty}; use middle::ty::TyVar; use middle::infer::combine::*; use middle::infer::{cres}; diff --git a/src/librustc/middle/infer/error_reporting.rs b/src/librustc/middle/infer/error_reporting.rs index 6f1c7af5b86..7ff585087f5 100644 --- a/src/librustc/middle/infer/error_reporting.rs +++ b/src/librustc/middle/infer/error_reporting.rs @@ -74,7 +74,7 @@ use std::collections::HashSet; use middle::def; use middle::infer; use middle::subst; -use middle::ty::{mod, Ty}; +use middle::ty::{self, Ty}; use middle::ty::{Region, ReFree}; use std::cell::{Cell, RefCell}; use std::char::from_u32; diff --git a/src/librustc/middle/infer/freshen.rs b/src/librustc/middle/infer/freshen.rs index 33174409f89..0ae4a3d851e 100644 --- a/src/librustc/middle/infer/freshen.rs +++ b/src/librustc/middle/infer/freshen.rs @@ -30,11 +30,11 @@ //! variable only once, and it does so as soon as it can, so it is reasonable to ask what the type //! inferencer knows "so far". -use middle::ty::{mod, Ty}; +use middle::ty::{self, Ty}; use middle::ty_fold; use middle::ty_fold::TypeFoldable; use middle::ty_fold::TypeFolder; -use std::collections::hash_map::{mod, Entry}; +use std::collections::hash_map::{self, Entry}; use super::InferCtxt; use super::unify::InferCtxtMethodsForSimplyUnifiableTypes; diff --git a/src/librustc/middle/infer/glb.rs b/src/librustc/middle/infer/glb.rs index 434be32fe5f..2683d00b858 100644 --- a/src/librustc/middle/infer/glb.rs +++ b/src/librustc/middle/infer/glb.rs @@ -18,7 +18,7 @@ use super::{cres, InferCtxt}; use super::{TypeTrace, Subtype}; use middle::ty::{BuiltinBounds}; -use middle::ty::{mod, Ty}; +use middle::ty::{self, Ty}; use syntax::ast::{Many, Once, MutImmutable, MutMutable}; use syntax::ast::{Onceness, Unsafety}; use util::ppaux::mt_to_string; diff --git a/src/librustc/middle/infer/higher_ranked/mod.rs b/src/librustc/middle/infer/higher_ranked/mod.rs index 2a19f37e7d4..bf0a9cfbea6 100644 --- a/src/librustc/middle/infer/higher_ranked/mod.rs +++ b/src/librustc/middle/infer/higher_ranked/mod.rs @@ -14,8 +14,8 @@ use super::{CombinedSnapshot, cres, InferCtxt, HigherRankedType, SkolemizationMap}; use super::combine::{Combine, Combineable}; -use middle::ty::{mod, Binder}; -use middle::ty_fold::{mod, TypeFoldable}; +use middle::ty::{self, Binder}; +use middle::ty_fold::{self, TypeFoldable}; use syntax::codemap::Span; use util::nodemap::{FnvHashMap, FnvHashSet}; use util::ppaux::Repr; diff --git a/src/librustc/middle/infer/lattice.rs b/src/librustc/middle/infer/lattice.rs index dd514ebee52..121e5405f26 100644 --- a/src/librustc/middle/infer/lattice.rs +++ b/src/librustc/middle/infer/lattice.rs @@ -35,7 +35,7 @@ use super::glb::Glb; use super::lub::Lub; use middle::ty::{TyVar}; -use middle::ty::{mod, Ty}; +use middle::ty::{self, Ty}; use util::ppaux::Repr; pub trait LatticeDir<'tcx> { diff --git a/src/librustc/middle/infer/lub.rs b/src/librustc/middle/infer/lub.rs index f4909b28891..e4cab0f8899 100644 --- a/src/librustc/middle/infer/lub.rs +++ b/src/librustc/middle/infer/lub.rs @@ -18,7 +18,7 @@ use super::{cres, InferCtxt}; use super::{TypeTrace, Subtype}; use middle::ty::{BuiltinBounds}; -use middle::ty::{mod, Ty}; +use middle::ty::{self, Ty}; use syntax::ast::{Many, Once}; use syntax::ast::{Onceness, Unsafety}; use syntax::ast::{MutMutable, MutImmutable}; diff --git a/src/librustc/middle/infer/mod.rs b/src/librustc/middle/infer/mod.rs index d9b7e04bc79..8c3ee83e40d 100644 --- a/src/librustc/middle/infer/mod.rs +++ b/src/librustc/middle/infer/mod.rs @@ -25,7 +25,7 @@ use middle::subst; use middle::subst::Substs; use middle::ty::{TyVid, IntVid, FloatVid, RegionVid, UnconstrainedNumeric}; use middle::ty::replace_late_bound_regions; -use middle::ty::{mod, Ty}; +use middle::ty::{self, Ty}; use middle::ty_fold::{TypeFolder, TypeFoldable}; use std::cell::{RefCell}; use std::rc::Rc; diff --git a/src/librustc/middle/infer/region_inference/graphviz.rs b/src/librustc/middle/infer/region_inference/graphviz.rs index b6020fe5ce3..f31c0d509c5 100644 --- a/src/librustc/middle/infer/region_inference/graphviz.rs +++ b/src/librustc/middle/infer/region_inference/graphviz.rs @@ -27,7 +27,7 @@ use util::nodemap::{FnvHashMap, FnvHashSet}; use util::ppaux::Repr; use std::collections::hash_map::Entry::Vacant; -use std::io::{mod, File}; +use std::io::{self, File}; use std::os; use std::sync::atomic; use syntax::ast; diff --git a/src/librustc/middle/infer/region_inference/mod.rs b/src/librustc/middle/infer/region_inference/mod.rs index 6ac1c5470cc..9c1aa673ccf 100644 --- a/src/librustc/middle/infer/region_inference/mod.rs +++ b/src/librustc/middle/infer/region_inference/mod.rs @@ -33,7 +33,7 @@ use util::nodemap::{FnvHashMap, FnvHashSet}; use util::ppaux::Repr; use std::cell::{Cell, RefCell}; -use std::cmp::Ordering::{mod, Less, Greater, Equal}; +use std::cmp::Ordering::{self, Less, Greater, Equal}; use std::iter::repeat; use std::u32; use syntax::ast; diff --git a/src/librustc/middle/infer/resolve.rs b/src/librustc/middle/infer/resolve.rs index ca2ae25e6c6..3ed866d4aba 100644 --- a/src/librustc/middle/infer/resolve.rs +++ b/src/librustc/middle/infer/resolve.rs @@ -9,8 +9,8 @@ // except according to those terms. use super::{InferCtxt, fixup_err, fres, unresolved_ty, unresolved_int_ty, unresolved_float_ty}; -use middle::ty::{mod, Ty}; -use middle::ty_fold::{mod, TypeFoldable}; +use middle::ty::{self, Ty}; +use middle::ty_fold::{self, TypeFoldable}; use util::ppaux::Repr; /////////////////////////////////////////////////////////////////////////// diff --git a/src/librustc/middle/infer/sub.rs b/src/librustc/middle/infer/sub.rs index 4bd3308728c..4f8364fa44a 100644 --- a/src/librustc/middle/infer/sub.rs +++ b/src/librustc/middle/infer/sub.rs @@ -19,7 +19,7 @@ use super::{TypeTrace, Subtype}; use super::type_variable::{SubtypeOf, SupertypeOf}; use middle::ty::{BuiltinBounds}; -use middle::ty::{mod, Ty}; +use middle::ty::{self, Ty}; use middle::ty::TyVar; use util::ppaux::{Repr}; diff --git a/src/librustc/middle/infer/type_variable.rs b/src/librustc/middle/infer/type_variable.rs index 49a1e6f9263..30cf0318aad 100644 --- a/src/librustc/middle/infer/type_variable.rs +++ b/src/librustc/middle/infer/type_variable.rs @@ -12,7 +12,7 @@ pub use self::RelationDir::*; use self::TypeVariableValue::*; use self::UndoEntry::*; -use middle::ty::{mod, Ty}; +use middle::ty::{self, Ty}; use std::cmp::min; use std::mem; use std::u32; diff --git a/src/librustc/middle/infer/unify.rs b/src/librustc/middle/infer/unify.rs index 3127ef5d8a5..03e00ef6769 100644 --- a/src/librustc/middle/infer/unify.rs +++ b/src/librustc/middle/infer/unify.rs @@ -13,7 +13,7 @@ pub use self::VarValue::*; use std::kinds::marker; use middle::ty::{expected_found, IntVarValue}; -use middle::ty::{mod, Ty}; +use middle::ty::{self, Ty}; use middle::infer::{uok, ures}; use middle::infer::InferCtxt; use std::cell::RefCell; diff --git a/src/librustc/middle/intrinsicck.rs b/src/librustc/middle/intrinsicck.rs index 2962b7b7c8e..e3763689ef4 100644 --- a/src/librustc/middle/intrinsicck.rs +++ b/src/librustc/middle/intrinsicck.rs @@ -12,7 +12,7 @@ use metadata::csearch; use middle::def::DefFn; use middle::subst::{Subst, Substs, EnumeratedItems}; use middle::ty::{TransmuteRestriction, ctxt, ty_bare_fn}; -use middle::ty::{mod, Ty}; +use middle::ty::{self, Ty}; use util::ppaux::Repr; use syntax::abi::RustIntrinsic; diff --git a/src/librustc/middle/liveness.rs b/src/librustc/middle/liveness.rs index 0c3438abb2b..b6ce8fa8d2e 100644 --- a/src/librustc/middle/liveness.rs +++ b/src/librustc/middle/liveness.rs @@ -120,13 +120,13 @@ use util::nodemap::NodeMap; use std::{fmt, io, uint}; use std::rc::Rc; use std::iter::repeat; -use syntax::ast::{mod, NodeId, Expr}; +use syntax::ast::{self, NodeId, Expr}; use syntax::codemap::{BytePos, original_sp, Span}; -use syntax::parse::token::{mod, special_idents}; +use syntax::parse::token::{self, special_idents}; use syntax::print::pprust::{expr_to_string, block_to_string}; use syntax::ptr::P; use syntax::ast_util; -use syntax::visit::{mod, Visitor, FnKind}; +use syntax::visit::{self, Visitor, FnKind}; /// For use with `propagate_through_loop`. enum LoopKind<'a> { diff --git a/src/librustc/middle/mem_categorization.rs b/src/librustc/middle/mem_categorization.rs index 722fe82d41c..969c0a0f6f3 100644 --- a/src/librustc/middle/mem_categorization.rs +++ b/src/librustc/middle/mem_categorization.rs @@ -73,7 +73,7 @@ pub use self::categorization::*; use middle::def; use middle::region; -use middle::ty::{mod, Ty}; +use middle::ty::{self, Ty}; use util::nodemap::{NodeMap}; use util::ppaux::{Repr}; diff --git a/src/librustc/middle/privacy.rs b/src/librustc/middle/privacy.rs index cfa0d419aa3..0d3ed13753c 100644 --- a/src/librustc/middle/privacy.rs +++ b/src/librustc/middle/privacy.rs @@ -21,7 +21,7 @@ use std::mem::replace; use metadata::csearch; use middle::def; -use middle::ty::{mod, Ty}; +use middle::ty::{self, Ty}; use middle::ty::{MethodCall, MethodMap, MethodOrigin, MethodParam, MethodTypeParam}; use middle::ty::{MethodStatic, MethodStaticUnboxedClosure, MethodObject, MethodTraitObject}; use util::nodemap::{DefIdSet, NodeMap, NodeSet}; @@ -30,7 +30,7 @@ use syntax::{ast, ast_map}; use syntax::ast_util::{is_local, local_def, PostExpansionMethod}; use syntax::codemap::Span; use syntax::parse::token; -use syntax::visit::{mod, Visitor}; +use syntax::visit::{self, Visitor}; type Context<'a, 'tcx> = (&'a MethodMap<'tcx>, &'a def::ExportMap); diff --git a/src/librustc/middle/region.rs b/src/librustc/middle/region.rs index 0e47f338bb9..c0820408e2e 100644 --- a/src/librustc/middle/region.rs +++ b/src/librustc/middle/region.rs @@ -17,7 +17,7 @@ //! `middle/typeck/infer/region_inference.rs` use session::Session; -use middle::ty::{mod, Ty, FreeRegion}; +use middle::ty::{self, Ty, FreeRegion}; use util::nodemap::{FnvHashMap, FnvHashSet, NodeMap}; use util::common::can_reach; diff --git a/src/librustc/middle/resolve_lifetime.rs b/src/librustc/middle/resolve_lifetime.rs index e9504a92f7b..809871c3255 100644 --- a/src/librustc/middle/resolve_lifetime.rs +++ b/src/librustc/middle/resolve_lifetime.rs @@ -19,7 +19,7 @@ pub use self::DefRegion::*; use self::ScopeChain::*; use session::Session; -use middle::def::{mod, DefMap}; +use middle::def::{self, DefMap}; use middle::region; use middle::subst; use middle::ty; diff --git a/src/librustc/middle/subst.rs b/src/librustc/middle/subst.rs index e7971a82119..875c3f6e0d9 100644 --- a/src/librustc/middle/subst.rs +++ b/src/librustc/middle/subst.rs @@ -13,8 +13,8 @@ pub use self::ParamSpace::*; pub use self::RegionSubsts::*; -use middle::ty::{mod, Ty}; -use middle::ty_fold::{mod, TypeFoldable, TypeFolder}; +use middle::ty::{self, Ty}; +use middle::ty_fold::{self, TypeFoldable, TypeFolder}; use util::ppaux::Repr; use std::fmt; diff --git a/src/librustc/middle/traits/coherence.rs b/src/librustc/middle/traits/coherence.rs index 6a8b6d49cc0..e6805cddae0 100644 --- a/src/librustc/middle/traits/coherence.rs +++ b/src/librustc/middle/traits/coherence.rs @@ -15,7 +15,7 @@ use super::{Obligation, ObligationCause}; use super::util; use middle::subst::Subst; -use middle::ty::{mod, Ty}; +use middle::ty::{self, Ty}; use middle::infer::InferCtxt; use std::collections::HashSet; use std::rc::Rc; diff --git a/src/librustc/middle/traits/error_reporting.rs b/src/librustc/middle/traits/error_reporting.rs index 05ea2f9a7d2..59322fcc632 100644 --- a/src/librustc/middle/traits/error_reporting.rs +++ b/src/librustc/middle/traits/error_reporting.rs @@ -19,7 +19,7 @@ use super::{ }; use middle::infer::InferCtxt; -use middle::ty::{mod, AsPredicate, ReferencesError, ToPolyTraitRef}; +use middle::ty::{self, AsPredicate, ReferencesError, ToPolyTraitRef}; use syntax::codemap::Span; use util::ppaux::{Repr, UserString}; diff --git a/src/librustc/middle/traits/fulfill.rs b/src/librustc/middle/traits/fulfill.rs index e8a22e3d1d8..8bb7012fb07 100644 --- a/src/librustc/middle/traits/fulfill.rs +++ b/src/librustc/middle/traits/fulfill.rs @@ -10,7 +10,7 @@ use middle::infer::{InferCtxt}; use middle::mem_categorization::Typer; -use middle::ty::{mod, RegionEscape, Ty}; +use middle::ty::{self, RegionEscape, Ty}; use std::collections::HashSet; use std::collections::hash_map::Entry::{Occupied, Vacant}; use std::default::Default; diff --git a/src/librustc/middle/traits/mod.rs b/src/librustc/middle/traits/mod.rs index 1a1d52a047c..8fe851092dc 100644 --- a/src/librustc/middle/traits/mod.rs +++ b/src/librustc/middle/traits/mod.rs @@ -17,7 +17,7 @@ pub use self::ObligationCauseCode::*; use middle::mem_categorization::Typer; use middle::subst; -use middle::ty::{mod, Ty}; +use middle::ty::{self, Ty}; use middle::infer::InferCtxt; use std::slice::Iter; use std::rc::Rc; diff --git a/src/librustc/middle/traits/object_safety.rs b/src/librustc/middle/traits/object_safety.rs index 6b7bf82af92..53068ea2bec 100644 --- a/src/librustc/middle/traits/object_safety.rs +++ b/src/librustc/middle/traits/object_safety.rs @@ -20,9 +20,9 @@ use super::supertraits; use super::elaborate_predicates; -use middle::subst::{mod, SelfSpace}; +use middle::subst::{self, SelfSpace}; use middle::traits; -use middle::ty::{mod, Ty}; +use middle::ty::{self, Ty}; use std::rc::Rc; use syntax::ast; use util::ppaux::Repr; diff --git a/src/librustc/middle/traits/project.rs b/src/librustc/middle/traits/project.rs index d7f570df072..d053b7fa70c 100644 --- a/src/librustc/middle/traits/project.rs +++ b/src/librustc/middle/traits/project.rs @@ -21,9 +21,9 @@ use super::VtableImplData; use middle::infer; use middle::subst::Subst; -use middle::ty::{mod, AsPredicate, ReferencesError, RegionEscape, +use middle::ty::{self, AsPredicate, ReferencesError, RegionEscape, HasProjectionTypes, ToPolyTraitRef, Ty}; -use middle::ty_fold::{mod, TypeFoldable, TypeFolder}; +use middle::ty_fold::{self, TypeFoldable, TypeFolder}; use std::rc::Rc; use util::ppaux::Repr; diff --git a/src/librustc/middle/traits/select.rs b/src/librustc/middle/traits/select.rs index c6fccab95a4..86365a1ae49 100644 --- a/src/librustc/middle/traits/select.rs +++ b/src/librustc/middle/traits/select.rs @@ -33,7 +33,7 @@ use super::{util}; use middle::fast_reject; use middle::mem_categorization::Typer; use middle::subst::{Subst, Substs, TypeSpace, VecPerParamSpace}; -use middle::ty::{mod, AsPredicate, RegionEscape, ToPolyTraitRef, Ty}; +use middle::ty::{self, AsPredicate, RegionEscape, ToPolyTraitRef, Ty}; use middle::infer; use middle::infer::{InferCtxt, TypeFreshener}; use middle::ty_fold::TypeFoldable; diff --git a/src/librustc/middle/traits/util.rs b/src/librustc/middle/traits/util.rs index e4578f74763..ab8888f9a33 100644 --- a/src/librustc/middle/traits/util.rs +++ b/src/librustc/middle/traits/util.rs @@ -10,7 +10,7 @@ use middle::subst::{Substs, VecPerParamSpace}; use middle::infer::InferCtxt; -use middle::ty::{mod, Ty, AsPredicate, ToPolyTraitRef}; +use middle::ty::{self, Ty, AsPredicate, ToPolyTraitRef}; use std::collections::HashSet; use std::fmt; use std::rc::Rc; diff --git a/src/librustc/middle/ty.rs b/src/librustc/middle/ty.rs index 20ded8ad0e0..a53278305d1 100644 --- a/src/librustc/middle/ty.rs +++ b/src/librustc/middle/ty.rs @@ -46,7 +46,7 @@ use lint; use metadata::csearch; use middle; use middle::const_eval; -use middle::def::{mod, DefMap, ExportMap}; +use middle::def::{self, DefMap, ExportMap}; use middle::dependency_format; use middle::lang_items::{FnTraitLangItem, FnMutTraitLangItem}; use middle::lang_items::{FnOnceTraitLangItem, TyDescStructLangItem}; @@ -55,10 +55,10 @@ use middle::region; use middle::resolve_lifetime; use middle::infer; use middle::stability; -use middle::subst::{mod, Subst, Substs, VecPerParamSpace}; +use middle::subst::{self, Subst, Substs, VecPerParamSpace}; use middle::traits; use middle::ty; -use middle::ty_fold::{mod, TypeFoldable, TypeFolder}; +use middle::ty_fold::{self, TypeFoldable, TypeFolder}; use middle::ty_walk::TypeWalker; use util::ppaux::{note_and_explain_region, bound_region_ptr_to_string}; use util::ppaux::{trait_store_to_string, ty_to_string}; @@ -70,8 +70,8 @@ use util::nodemap::{FnvHashMap}; use arena::TypedArena; use std::borrow::BorrowFrom; use std::cell::{Cell, RefCell}; -use std::cmp::{mod, Ordering}; -use std::fmt::{mod, Show}; +use std::cmp::{self, Ordering}; +use std::fmt::{self, Show}; use std::hash::{Hash, sip, Writer}; use std::mem; use std::ops; @@ -84,10 +84,10 @@ use syntax::ast::{CrateNum, DefId, Ident, ItemTrait, LOCAL_CRATE}; use syntax::ast::{MutImmutable, MutMutable, Name, NamedField, NodeId}; use syntax::ast::{Onceness, StmtExpr, StmtSemi, StructField, UnnamedField}; use syntax::ast::{Visibility}; -use syntax::ast_util::{mod, is_local, lit_is_str, local_def, PostExpansionMethod}; -use syntax::attr::{mod, AttrMetaMethods}; +use syntax::ast_util::{self, is_local, lit_is_str, local_def, PostExpansionMethod}; +use syntax::attr::{self, AttrMetaMethods}; use syntax::codemap::Span; -use syntax::parse::token::{mod, InternedString, special_idents}; +use syntax::parse::token::{self, InternedString, special_idents}; use syntax::{ast, ast_map}; pub type Disr = u64; diff --git a/src/librustc/middle/ty_fold.rs b/src/librustc/middle/ty_fold.rs index abbf530529b..9a66b98ee58 100644 --- a/src/librustc/middle/ty_fold.rs +++ b/src/librustc/middle/ty_fold.rs @@ -36,7 +36,7 @@ use middle::subst; use middle::subst::VecPerParamSpace; -use middle::ty::{mod, Ty}; +use middle::ty::{self, Ty}; use middle::traits; use std::rc::Rc; use syntax::owned_slice::OwnedSlice; diff --git a/src/librustc/middle/ty_walk.rs b/src/librustc/middle/ty_walk.rs index 12df36c10fc..6070a4208f6 100644 --- a/src/librustc/middle/ty_walk.rs +++ b/src/librustc/middle/ty_walk.rs @@ -10,7 +10,7 @@ //! An iterator over the type substructure. -use middle::ty::{mod, Ty}; +use middle::ty::{self, Ty}; use std::iter::Iterator; pub struct TypeWalker<'tcx> { diff --git a/src/librustc/session/mod.rs b/src/librustc/session/mod.rs index 86a3a6001f9..770e8d73ec7 100644 --- a/src/librustc/session/mod.rs +++ b/src/librustc/session/mod.rs @@ -17,7 +17,7 @@ use util::nodemap::NodeMap; use syntax::ast::NodeId; use syntax::codemap::Span; -use syntax::diagnostic::{mod, Emitter}; +use syntax::diagnostic::{self, Emitter}; use syntax::diagnostics; use syntax::feature_gate; use syntax::parse; diff --git a/src/librustc_borrowck/borrowck/mod.rs b/src/librustc_borrowck/borrowck/mod.rs index d81974d1ae0..430e85d0b6c 100644 --- a/src/librustc_borrowck/borrowck/mod.rs +++ b/src/librustc_borrowck/borrowck/mod.rs @@ -25,7 +25,7 @@ use rustc::middle::dataflow::DataFlowOperator; use rustc::middle::expr_use_visitor as euv; use rustc::middle::mem_categorization as mc; use rustc::middle::region; -use rustc::middle::ty::{mod, Ty}; +use rustc::middle::ty::{self, Ty}; use rustc::util::ppaux::{note_and_explain_region, Repr, UserString}; use std::rc::Rc; use std::string::String; diff --git a/src/librustc_driver/driver.rs b/src/librustc_driver/driver.rs index a92c2fe2ccb..1455aa3c99b 100644 --- a/src/librustc_driver/driver.rs +++ b/src/librustc_driver/driver.rs @@ -9,7 +9,7 @@ // except according to those terms. use rustc::session::Session; -use rustc::session::config::{mod, Input, OutputFilenames}; +use rustc::session::config::{self, Input, OutputFilenames}; use rustc::session::search_paths::PathKind; use rustc::lint; use rustc::metadata::creader; diff --git a/src/librustc_driver/pretty.rs b/src/librustc_driver/pretty.rs index 561099550ce..b2f4070d200 100644 --- a/src/librustc_driver/pretty.rs +++ b/src/librustc_driver/pretty.rs @@ -23,21 +23,21 @@ use rustc::middle::ty; use rustc::middle::cfg; use rustc::middle::cfg::graphviz::LabelledCFG; use rustc::session::Session; -use rustc::session::config::{mod, Input}; +use rustc::session::config::{self, Input}; use rustc::util::ppaux; use rustc_borrowck as borrowck; use rustc_borrowck::graphviz as borrowck_dot; use syntax::ast; -use syntax::ast_map::{mod, blocks, NodePrinter}; +use syntax::ast_map::{self, blocks, NodePrinter}; use syntax::codemap; -use syntax::fold::{mod, Folder}; +use syntax::fold::{self, Folder}; use syntax::print::{pp, pprust}; use syntax::ptr::P; use graphviz as dot; -use std::io::{mod, MemReader}; +use std::io::{self, MemReader}; use std::option; use std::str::FromStr; diff --git a/src/librustc_driver/test.rs b/src/librustc_driver/test.rs index eddcc750068..ab41ade576a 100644 --- a/src/librustc_driver/test.rs +++ b/src/librustc_driver/test.rs @@ -15,19 +15,19 @@ use diagnostic::Emitter; use driver; use rustc_resolve as resolve; use rustc_typeck::middle::lang_items; -use rustc_typeck::middle::region::{mod, CodeExtent}; +use rustc_typeck::middle::region::{self, CodeExtent}; use rustc_typeck::middle::resolve_lifetime; use rustc_typeck::middle::stability; use rustc_typeck::middle::subst; use rustc_typeck::middle::subst::Subst; -use rustc_typeck::middle::ty::{mod, Ty}; +use rustc_typeck::middle::ty::{self, Ty}; use rustc_typeck::middle::infer::combine::Combine; use rustc_typeck::middle::infer; use rustc_typeck::middle::infer::lub::Lub; use rustc_typeck::middle::infer::glb::Glb; use rustc_typeck::middle::infer::sub::Sub; use rustc_typeck::util::ppaux::{ty_to_string, Repr, UserString}; -use rustc::session::{mod,config}; +use rustc::session::{self,config}; use syntax::{abi, ast, ast_map}; use syntax::codemap; use syntax::codemap::{Span, CodeMap, DUMMY_SP}; diff --git a/src/librustc_resolve/build_reduced_graph.rs b/src/librustc_resolve/build_reduced_graph.rs index aa3ac83c027..2fc039764ae 100644 --- a/src/librustc_resolve/build_reduced_graph.rs +++ b/src/librustc_resolve/build_reduced_graph.rs @@ -15,13 +15,13 @@ use {DefModifiers, PUBLIC, IMPORTABLE}; use ImportDirective; -use ImportDirectiveSubclass::{mod, SingleImport, GlobImport}; +use ImportDirectiveSubclass::{self, SingleImport, GlobImport}; use ImportResolution; use Module; use ModuleKind::*; use Namespace::{TypeNS, ValueNS}; use NameBindings; -use ParentLink::{mod, ModuleParentLink, BlockParentLink}; +use ParentLink::{self, ModuleParentLink, BlockParentLink}; use Resolver; use RibKind::*; use Shadowable; @@ -55,11 +55,11 @@ use syntax::ast::{ViewItemUse, ViewPathGlob, ViewPathList, ViewPathSimple}; use syntax::ast::{Visibility}; use syntax::ast::TyPath; use syntax::ast; -use syntax::ast_util::{mod, PostExpansionMethod, local_def}; +use syntax::ast_util::{self, PostExpansionMethod, local_def}; use syntax::attr::AttrMetaMethods; -use syntax::parse::token::{mod, special_idents}; +use syntax::parse::token::{self, special_idents}; use syntax::codemap::{Span, DUMMY_SP}; -use syntax::visit::{mod, Visitor}; +use syntax::visit::{self, Visitor}; use std::mem::replace; use std::ops::{Deref, DerefMut}; diff --git a/src/librustc_resolve/check_unused.rs b/src/librustc_resolve/check_unused.rs index 1bfe4c0407a..26b1058d183 100644 --- a/src/librustc_resolve/check_unused.rs +++ b/src/librustc_resolve/check_unused.rs @@ -28,7 +28,7 @@ use syntax::ast; use syntax::ast::{ViewItem, ViewItemExternCrate, ViewItemUse}; use syntax::ast::{ViewPathGlob, ViewPathList, ViewPathSimple}; use syntax::codemap::{Span, DUMMY_SP}; -use syntax::visit::{mod, Visitor}; +use syntax::visit::{self, Visitor}; struct UnusedImportCheckVisitor<'a, 'b:'a, 'tcx:'b> { resolver: &'a mut Resolver<'b, 'tcx> diff --git a/src/librustc_resolve/lib.rs b/src/librustc_resolve/lib.rs index 4ac9224969c..f28e012b736 100644 --- a/src/librustc_resolve/lib.rs +++ b/src/librustc_resolve/lib.rs @@ -81,10 +81,10 @@ use syntax::ast_map; use syntax::ast_util::{PostExpansionMethod, local_def, walk_pat}; use syntax::attr::AttrMetaMethods; use syntax::ext::mtwt; -use syntax::parse::token::{mod, special_names, special_idents}; +use syntax::parse::token::{self, special_names, special_idents}; use syntax::codemap::{Span, Pos}; use syntax::owned_slice::OwnedSlice; -use syntax::visit::{mod, Visitor}; +use syntax::visit::{self, Visitor}; use std::collections::{HashMap, HashSet}; use std::collections::hash_map::Entry::{Occupied, Vacant}; diff --git a/src/librustc_resolve/record_exports.rs b/src/librustc_resolve/record_exports.rs index ff415750d64..84fd3c93671 100644 --- a/src/librustc_resolve/record_exports.rs +++ b/src/librustc_resolve/record_exports.rs @@ -19,7 +19,7 @@ // processing. use {Module, NameBindings, Resolver}; -use Namespace::{mod, TypeNS, ValueNS}; +use Namespace::{self, TypeNS, ValueNS}; use build_reduced_graph; diff --git a/src/librustc_trans/back/link.rs b/src/librustc_trans/back/link.rs index c3c97616ea8..8fbeadc55b3 100644 --- a/src/librustc_trans/back/link.rs +++ b/src/librustc_trans/back/link.rs @@ -22,7 +22,7 @@ use metadata::common::LinkMeta; use metadata::{encoder, cstore, filesearch, csearch, creader}; use metadata::filesearch::FileDoesntMatch; use trans::{CrateContext, CrateTranslation, gensym_name}; -use middle::ty::{mod, Ty}; +use middle::ty::{self, Ty}; use util::common::time; use util::ppaux; use util::sha2::{Digest, Sha256}; diff --git a/src/librustc_trans/back/lto.rs b/src/librustc_trans/back/lto.rs index 7cf4bafe032..c6488ec6638 100644 --- a/src/librustc_trans/back/lto.rs +++ b/src/librustc_trans/back/lto.rs @@ -10,7 +10,7 @@ use super::link; use super::write; -use rustc::session::{mod, config}; +use rustc::session::{self, config}; use llvm; use llvm::archive_ro::ArchiveRO; use llvm::{ModuleRef, TargetMachineRef, True, False}; diff --git a/src/librustc_trans/save/mod.rs b/src/librustc_trans/save/mod.rs index 73961f00d70..55bdff81910 100644 --- a/src/librustc_trans/save/mod.rs +++ b/src/librustc_trans/save/mod.rs @@ -30,20 +30,20 @@ use session::Session; use middle::def; -use middle::ty::{mod, Ty}; +use middle::ty::{self, Ty}; use std::cell::Cell; -use std::io::{mod, File, fs}; +use std::io::{self, File, fs}; use std::os; -use syntax::ast_util::{mod, PostExpansionMethod}; -use syntax::ast::{mod, NodeId, DefId}; +use syntax::ast_util::{self, PostExpansionMethod}; +use syntax::ast::{self, NodeId, DefId}; use syntax::ast_map::NodeItem; use syntax::attr; use syntax::codemap::*; -use syntax::parse::token::{mod, get_ident, keywords}; +use syntax::parse::token::{self, get_ident, keywords}; use syntax::owned_slice::OwnedSlice; -use syntax::visit::{mod, Visitor}; +use syntax::visit::{self, Visitor}; use syntax::print::pprust::{path_to_string,ty_to_string}; use syntax::ptr::P; diff --git a/src/librustc_trans/trans/_match.rs b/src/librustc_trans/trans/_match.rs index 19781a51d57..6fe530d6e1d 100644 --- a/src/librustc_trans/trans/_match.rs +++ b/src/librustc_trans/trans/_match.rs @@ -193,7 +193,7 @@ use llvm::{ValueRef, BasicBlockRef}; use middle::check_match::StaticInliner; use middle::check_match; use middle::const_eval; -use middle::def::{mod, DefMap}; +use middle::def::{self, DefMap}; use middle::expr_use_visitor as euv; use middle::lang_items::StrEqFnLangItem; use middle::mem_categorization as mc; @@ -204,15 +204,15 @@ use trans::build::{AddCase, And, BitCast, Br, CondBr, GEPi, InBoundsGEP, Load}; use trans::build::{Mul, Not, Store, Sub, add_comment}; use trans::build; use trans::callee; -use trans::cleanup::{mod, CleanupMethods}; +use trans::cleanup::{self, CleanupMethods}; use trans::common::*; use trans::consts; use trans::datum::*; -use trans::expr::{mod, Dest}; +use trans::expr::{self, Dest}; use trans::tvec; use trans::type_of; use trans::debuginfo; -use middle::ty::{mod, Ty}; +use middle::ty::{self, Ty}; use session::config::FullDebugInfo; use util::common::indenter; use util::nodemap::FnvHashMap; diff --git a/src/librustc_trans/trans/adt.rs b/src/librustc_trans/trans/adt.rs index 85a7ec33069..881068325da 100644 --- a/src/librustc_trans/trans/adt.rs +++ b/src/librustc_trans/trans/adt.rs @@ -61,7 +61,7 @@ use trans::datum; use trans::machine; use trans::type_::Type; use trans::type_of; -use middle::ty::{mod, Ty, UnboxedClosureTyper}; +use middle::ty::{self, Ty, UnboxedClosureTyper}; use middle::ty::Disr; use syntax::ast; use syntax::attr; diff --git a/src/librustc_trans/trans/base.rs b/src/librustc_trans/trans/base.rs index 225f6f116da..bf37f399fa8 100644 --- a/src/librustc_trans/trans/base.rs +++ b/src/librustc_trans/trans/base.rs @@ -43,8 +43,8 @@ use middle::lang_items::{LangItem, ExchangeMallocFnLangItem, StartFnLangItem}; use middle::subst; use middle::weak_lang_items; use middle::subst::{Subst, Substs}; -use middle::ty::{mod, Ty, UnboxedClosureTyper}; -use session::config::{mod, NoDebugInfo, FullDebugInfo}; +use middle::ty::{self, Ty, UnboxedClosureTyper}; +use session::config::{self, NoDebugInfo, FullDebugInfo}; use session::Session; use trans::_match; use trans::adt; diff --git a/src/librustc_trans/trans/callee.rs b/src/librustc_trans/trans/callee.rs index 169e52bcfe5..c65394c174a 100644 --- a/src/librustc_trans/trans/callee.rs +++ b/src/librustc_trans/trans/callee.rs @@ -48,7 +48,7 @@ use trans::meth; use trans::monomorphize; use trans::type_::Type; use trans::type_of; -use middle::ty::{mod, Ty}; +use middle::ty::{self, Ty}; use middle::ty::MethodCall; use util::ppaux::Repr; use util::ppaux::ty_to_string; diff --git a/src/librustc_trans/trans/cleanup.rs b/src/librustc_trans/trans/cleanup.rs index 8ac427dd061..f0ed8f4efcb 100644 --- a/src/librustc_trans/trans/cleanup.rs +++ b/src/librustc_trans/trans/cleanup.rs @@ -27,7 +27,7 @@ use trans::glue; // Temporary due to slicing syntax hacks (KILLME) //use middle::region; use trans::type_::Type; -use middle::ty::{mod, Ty}; +use middle::ty::{self, Ty}; use std::fmt; use syntax::ast; use util::ppaux::Repr; diff --git a/src/librustc_trans/trans/closure.rs b/src/librustc_trans/trans/closure.rs index 93a5b54fde3..a6a83447cd6 100644 --- a/src/librustc_trans/trans/closure.rs +++ b/src/librustc_trans/trans/closure.rs @@ -22,10 +22,10 @@ use trans::common::*; use trans::datum::{Datum, DatumBlock, Expr, Lvalue, rvalue_scratch_datum}; use trans::debuginfo; use trans::expr; -use trans::monomorphize::{mod, MonoId}; +use trans::monomorphize::{self, MonoId}; use trans::type_of::*; use trans::type_::Type; -use middle::ty::{mod, Ty, UnboxedClosureTyper}; +use middle::ty::{self, Ty, UnboxedClosureTyper}; use middle::subst::{Substs}; use session::config::FullDebugInfo; use util::ppaux::Repr; diff --git a/src/librustc_trans/trans/common.rs b/src/librustc_trans/trans/common.rs index 6efdcc2f0fa..d0ea0f69c05 100644 --- a/src/librustc_trans/trans/common.rs +++ b/src/librustc_trans/trans/common.rs @@ -24,7 +24,7 @@ use middle::infer; use middle::lang_items::LangItem; use middle::mem_categorization as mc; use middle::region; -use middle::subst::{mod, Subst, Substs}; +use middle::subst::{self, Subst, Substs}; use trans::base; use trans::build; use trans::cleanup; @@ -35,7 +35,7 @@ use trans::monomorphize; use trans::type_::Type; use trans::type_of; use middle::traits; -use middle::ty::{mod, HasProjectionTypes, Ty}; +use middle::ty::{self, HasProjectionTypes, Ty}; use middle::ty_fold; use middle::ty_fold::{TypeFolder, TypeFoldable}; use util::ppaux::Repr; diff --git a/src/librustc_trans/trans/consts.rs b/src/librustc_trans/trans/consts.rs index 347ec100ae7..4f8554195e5 100644 --- a/src/librustc_trans/trans/consts.rs +++ b/src/librustc_trans/trans/consts.rs @@ -17,11 +17,11 @@ use llvm::{IntEQ, IntNE, IntUGT, IntUGE, IntULT, IntULE, IntSGT, IntSGE, IntSLT, use metadata::csearch; use middle::{const_eval, def}; use trans::{adt, closure, consts, debuginfo, expr, inline, machine}; -use trans::base::{mod, push_ctxt}; +use trans::base::{self, push_ctxt}; use trans::common::*; use trans::type_::Type; use trans::type_of; -use middle::ty::{mod, Ty}; +use middle::ty::{self, Ty}; use util::ppaux::{Repr, ty_to_string}; use std::c_str::ToCStr; diff --git a/src/librustc_trans/trans/context.rs b/src/librustc_trans/trans/context.rs index 67aecde6618..e5a0e2e9234 100644 --- a/src/librustc_trans/trans/context.rs +++ b/src/librustc_trans/trans/context.rs @@ -22,7 +22,7 @@ use trans::common::{ExternMap,tydesc_info,BuilderRef_res}; use trans::debuginfo; use trans::monomorphize::MonoId; use trans::type_::{Type, TypeNames}; -use middle::ty::{mod, Ty}; +use middle::ty::{self, Ty}; use session::config::NoDebugInfo; use session::Session; use util::ppaux::Repr; diff --git a/src/librustc_trans/trans/datum.rs b/src/librustc_trans/trans/datum.rs index 72074040a2c..96013bc7423 100644 --- a/src/librustc_trans/trans/datum.rs +++ b/src/librustc_trans/trans/datum.rs @@ -23,7 +23,7 @@ use trans::cleanup::CleanupMethods; use trans::expr; use trans::tvec; use trans::type_of; -use middle::ty::{mod, Ty}; +use middle::ty::{self, Ty}; use util::ppaux::{ty_to_string}; use std::fmt; diff --git a/src/librustc_trans/trans/debuginfo.rs b/src/librustc_trans/trans/debuginfo.rs index 1a0007cf0fc..74cb6ea099a 100644 --- a/src/librustc_trans/trans/debuginfo.rs +++ b/src/librustc_trans/trans/debuginfo.rs @@ -194,15 +194,15 @@ use llvm; use llvm::{ModuleRef, ContextRef, ValueRef}; use llvm::debuginfo::*; use metadata::csearch; -use middle::subst::{mod, Substs}; -use trans::{mod, adt, machine, type_of}; +use middle::subst::{self, Substs}; +use trans::{self, adt, machine, type_of}; use trans::common::*; use trans::_match::{BindingInfo, TrByCopy, TrByMove, TrByRef}; use trans::monomorphize; use trans::type_::Type; -use middle::ty::{mod, Ty, UnboxedClosureTyper}; +use middle::ty::{self, Ty, UnboxedClosureTyper}; use middle::pat_util; -use session::config::{mod, FullDebugInfo, LimitedDebugInfo, NoDebugInfo}; +use session::config::{self, FullDebugInfo, LimitedDebugInfo, NoDebugInfo}; use util::nodemap::{DefIdMap, NodeMap, FnvHashMap, FnvHashSet}; use util::ppaux; @@ -215,7 +215,7 @@ use syntax::util::interner::Interner; use syntax::codemap::{Span, Pos}; use syntax::{ast, codemap, ast_util, ast_map, attr}; use syntax::ast_util::PostExpansionMethod; -use syntax::parse::token::{mod, special_idents}; +use syntax::parse::token::{self, special_idents}; const DW_LANG_RUST: c_uint = 0x9000; diff --git a/src/librustc_trans/trans/expr.rs b/src/librustc_trans/trans/expr.rs index cf3070919cb..f1721f22315 100644 --- a/src/librustc_trans/trans/expr.rs +++ b/src/librustc_trans/trans/expr.rs @@ -36,14 +36,14 @@ pub use self::Dest::*; use self::lazy_binop_ty::*; use back::abi; -use llvm::{mod, ValueRef}; +use llvm::{self, ValueRef}; use middle::def; use middle::mem_categorization::Typer; -use middle::subst::{mod, Substs}; +use middle::subst::{self, Substs}; use trans::{_match, adt, asm, base, callee, closure, consts, controlflow}; use trans::base::*; use trans::build::*; -use trans::cleanup::{mod, CleanupMethods}; +use trans::cleanup::{self, CleanupMethods}; use trans::common::*; use trans::datum::*; use trans::debuginfo; @@ -56,7 +56,7 @@ use trans::type_of; use middle::ty::{struct_fields, tup_fields}; use middle::ty::{AdjustDerefRef, AdjustReifyFnPointer, AdjustAddEnv, AutoUnsafe}; use middle::ty::{AutoPtr}; -use middle::ty::{mod, Ty}; +use middle::ty::{self, Ty}; use middle::ty::MethodCall; use util::common::indenter; use util::ppaux::Repr; diff --git a/src/librustc_trans/trans/foreign.rs b/src/librustc_trans/trans/foreign.rs index 99dc971ed94..a4cfec791d8 100644 --- a/src/librustc_trans/trans/foreign.rs +++ b/src/librustc_trans/trans/foreign.rs @@ -23,7 +23,7 @@ use trans::monomorphize; use trans::type_::Type; use trans::type_of::*; use trans::type_of; -use middle::ty::{mod, Ty}; +use middle::ty::{self, Ty}; use middle::subst::{Substs}; use std::cmp; use std::c_str::ToCStr; diff --git a/src/librustc_trans/trans/glue.rs b/src/librustc_trans/trans/glue.rs index ab5c670ef5a..0ff53a1af71 100644 --- a/src/librustc_trans/trans/glue.rs +++ b/src/librustc_trans/trans/glue.rs @@ -34,7 +34,7 @@ use trans::machine::*; use trans::tvec; use trans::type_::Type; use trans::type_of::{type_of, sizing_type_of, align_of}; -use middle::ty::{mod, Ty}; +use middle::ty::{self, Ty}; use util::ppaux::{ty_to_short_str, Repr}; use util::ppaux; diff --git a/src/librustc_trans/trans/intrinsic.rs b/src/librustc_trans/trans/intrinsic.rs index 94149325018..6e716538911 100644 --- a/src/librustc_trans/trans/intrinsic.rs +++ b/src/librustc_trans/trans/intrinsic.rs @@ -28,7 +28,7 @@ use trans::type_of; use trans::machine; use trans::machine::llsize_of; use trans::type_::Type; -use middle::ty::{mod, Ty}; +use middle::ty::{self, Ty}; use syntax::abi::RustIntrinsic; use syntax::ast; use syntax::parse::token; diff --git a/src/librustc_trans/trans/meth.rs b/src/librustc_trans/trans/meth.rs index f0588b3082a..ca17f3558ae 100644 --- a/src/librustc_trans/trans/meth.rs +++ b/src/librustc_trans/trans/meth.rs @@ -11,7 +11,7 @@ use arena::TypedArena; use back::abi; use back::link; -use llvm::{mod, ValueRef, get_param}; +use llvm::{self, ValueRef, get_param}; use metadata::csearch; use middle::subst::{Subst, Substs}; use middle::subst::VecPerParamSpace; @@ -30,7 +30,7 @@ use trans::glue; use trans::machine; use trans::type_::Type; use trans::type_of::*; -use middle::ty::{mod, Ty}; +use middle::ty::{self, Ty}; use middle::ty::MethodCall; use util::ppaux::Repr; diff --git a/src/librustc_trans/trans/monomorphize.rs b/src/librustc_trans/trans/monomorphize.rs index cc259e6765c..d172f0a18e8 100644 --- a/src/librustc_trans/trans/monomorphize.rs +++ b/src/librustc_trans/trans/monomorphize.rs @@ -23,7 +23,7 @@ use trans::base::{trans_fn, decl_internal_rust_fn}; use trans::base; use trans::common::*; use trans::foreign; -use middle::ty::{mod, HasProjectionTypes, Ty}; +use middle::ty::{self, HasProjectionTypes, Ty}; use util::ppaux::Repr; use syntax::abi; diff --git a/src/librustc_trans/trans/tvec.rs b/src/librustc_trans/trans/tvec.rs index 688a0d07250..0cb4f61a302 100644 --- a/src/librustc_trans/trans/tvec.rs +++ b/src/librustc_trans/trans/tvec.rs @@ -27,7 +27,7 @@ use trans::machine; use trans::machine::{nonzero_llsize_of, llsize_of_alloc}; use trans::type_::Type; use trans::type_of; -use middle::ty::{mod, Ty}; +use middle::ty::{self, Ty}; use util::ppaux::ty_to_string; use syntax::ast; diff --git a/src/librustc_trans/trans/type_of.rs b/src/librustc_trans/trans/type_of.rs index 0bc35390cd7..94f75f4804e 100644 --- a/src/librustc_trans/trans/type_of.rs +++ b/src/librustc_trans/trans/type_of.rs @@ -17,7 +17,7 @@ use trans::adt; use trans::common::*; use trans::foreign; use trans::machine; -use middle::ty::{mod, Ty}; +use middle::ty::{self, Ty}; use util::ppaux; use util::ppaux::Repr; diff --git a/src/librustc_typeck/astconv.rs b/src/librustc_typeck/astconv.rs index dee9aafd06d..1d62733875e 100644 --- a/src/librustc_typeck/astconv.rs +++ b/src/librustc_typeck/astconv.rs @@ -53,13 +53,13 @@ use middle::def; use middle::resolve_lifetime as rl; use middle::subst::{FnSpace, TypeSpace, SelfSpace, Subst, Substs}; use middle::subst::{VecPerParamSpace}; -use middle::ty::{mod, RegionEscape, Ty}; -use rscope::{mod, UnelidableRscope, RegionScope, SpecificRscope, +use middle::ty::{self, RegionEscape, Ty}; +use rscope::{self, UnelidableRscope, RegionScope, SpecificRscope, ShiftedRscope, BindingRscope}; use TypeAndSubsts; use util::common::ErrorReported; use util::nodemap::DefIdMap; -use util::ppaux::{mod, Repr, UserString}; +use util::ppaux::{self, Repr, UserString}; use std::rc::Rc; use std::iter::{repeat, AdditiveIterator}; diff --git a/src/librustc_typeck/check/_match.rs b/src/librustc_typeck/check/_match.rs index 7c431b4fc0b..d8b410abf84 100644 --- a/src/librustc_typeck/check/_match.rs +++ b/src/librustc_typeck/check/_match.rs @@ -12,7 +12,7 @@ use middle::def; use middle::infer; use middle::pat_util::{PatIdMap, pat_id_map, pat_is_binding, pat_is_const}; use middle::subst::{Substs}; -use middle::ty::{mod, Ty}; +use middle::ty::{self, Ty}; use check::{check_expr, check_expr_has_type, check_expr_with_expectation}; use check::{check_expr_coercable_to_type, demand, FnCtxt, Expectation}; use check::{instantiate_path, structurally_resolved_type, valid_range_bounds}; diff --git a/src/librustc_typeck/check/assoc.rs b/src/librustc_typeck/check/assoc.rs index 6950850e5f3..26b6d4e0296 100644 --- a/src/librustc_typeck/check/assoc.rs +++ b/src/librustc_typeck/check/assoc.rs @@ -9,9 +9,9 @@ // except according to those terms. use middle::infer::InferCtxt; -use middle::traits::{mod, FulfillmentContext, Normalized, MiscObligation, +use middle::traits::{self, FulfillmentContext, Normalized, MiscObligation, SelectionContext, ObligationCause}; -use middle::ty::{mod, HasProjectionTypes}; +use middle::ty::{self, HasProjectionTypes}; use middle::ty_fold::{TypeFoldable, TypeFolder}; use syntax::ast; use syntax::codemap::Span; diff --git a/src/librustc_typeck/check/closure.rs b/src/librustc_typeck/check/closure.rs index eba040e7ea8..db84f1dce97 100644 --- a/src/librustc_typeck/check/closure.rs +++ b/src/librustc_typeck/check/closure.rs @@ -16,7 +16,7 @@ use astconv; use middle::infer; use middle::region::CodeExtent; use middle::subst; -use middle::ty::{mod, ToPolyTraitRef, Ty}; +use middle::ty::{self, ToPolyTraitRef, Ty}; use rscope::RegionScope; use syntax::abi; use syntax::ast; diff --git a/src/librustc_typeck/check/demand.rs b/src/librustc_typeck/check/demand.rs index 9af9eaf75f5..5b586bb0b66 100644 --- a/src/librustc_typeck/check/demand.rs +++ b/src/librustc_typeck/check/demand.rs @@ -10,7 +10,7 @@ use check::FnCtxt; -use middle::ty::{mod, Ty}; +use middle::ty::{self, Ty}; use middle::infer; use std::result::Result::{Err, Ok}; diff --git a/src/librustc_typeck/check/method/confirm.rs b/src/librustc_typeck/check/method/confirm.rs index ee859bbe8f5..81cc62bcd67 100644 --- a/src/librustc_typeck/check/method/confirm.rs +++ b/src/librustc_typeck/check/method/confirm.rs @@ -10,11 +10,11 @@ use super::probe; -use check::{mod, FnCtxt, NoPreference, PreferMutLvalue, callee, demand}; +use check::{self, FnCtxt, NoPreference, PreferMutLvalue, callee, demand}; use middle::mem_categorization::Typer; use middle::subst::{mod}; use middle::traits; -use middle::ty::{mod, Ty}; +use middle::ty::{self, Ty}; use middle::ty::{MethodCall, MethodCallee, MethodObject, MethodOrigin, MethodParam, MethodStatic, MethodTraitObject, MethodTypeParam}; use middle::ty_fold::TypeFoldable; diff --git a/src/librustc_typeck/check/method/probe.rs b/src/librustc_typeck/check/method/probe.rs index cd97d89b246..e3813fc8951 100644 --- a/src/librustc_typeck/check/method/probe.rs +++ b/src/librustc_typeck/check/method/probe.rs @@ -18,7 +18,7 @@ use middle::fast_reject; use middle::subst; use middle::subst::Subst; use middle::traits; -use middle::ty::{mod, Ty, ToPolyTraitRef}; +use middle::ty::{self, Ty, ToPolyTraitRef}; use middle::ty_fold::TypeFoldable; use middle::infer; use middle::infer::InferCtxt; diff --git a/src/librustc_typeck/check/mod.rs b/src/librustc_typeck/check/mod.rs index 7f1feb9365a..01d61d44679 100644 --- a/src/librustc_typeck/check/mod.rs +++ b/src/librustc_typeck/check/mod.rs @@ -81,20 +81,20 @@ pub use self::Expectation::*; use self::IsBinopAssignment::*; use self::TupleArgumentsFlag::*; -use astconv::{mod, ast_region_to_region, ast_ty_to_ty, AstConv}; +use astconv::{self, ast_region_to_region, ast_ty_to_ty, AstConv}; use check::_match::pat_ctxt; use middle::{const_eval, def}; use middle::infer; use middle::lang_items::IteratorItem; use middle::mem_categorization as mc; use middle::mem_categorization::McResult; -use middle::pat_util::{mod, pat_id_map}; +use middle::pat_util::{self, pat_id_map}; use middle::region::CodeExtent; -use middle::subst::{mod, Subst, Substs, VecPerParamSpace, ParamSpace}; +use middle::subst::{self, Subst, Substs, VecPerParamSpace, ParamSpace}; use middle::traits; use middle::ty::{FnSig, VariantInfo, TypeScheme}; use middle::ty::{Disr, ParamTy, ParameterEnvironment}; -use middle::ty::{mod, HasProjectionTypes, RegionEscape, Ty}; +use middle::ty::{self, HasProjectionTypes, RegionEscape, Ty}; use middle::ty::liberate_late_bound_regions; use middle::ty::{MethodCall, MethodCallee, MethodMap, ObjectCastMap}; use middle::ty_fold::{TypeFolder, TypeFoldable}; @@ -105,22 +105,22 @@ use TypeAndSubsts; use middle::lang_items::TypeIdLangItem; use lint; use util::common::{block_query, indenter, loop_query}; -use util::ppaux::{mod, UserString, Repr}; +use util::ppaux::{self, UserString, Repr}; use util::nodemap::{DefIdMap, FnvHashMap, NodeMap}; use std::cell::{Cell, Ref, RefCell}; use std::mem::replace; use std::rc::Rc; use std::iter::repeat; -use syntax::{mod, abi, attr}; -use syntax::ast::{mod, ProvidedMethod, RequiredMethod, TypeTraitItem, DefId}; -use syntax::ast_util::{mod, local_def, PostExpansionMethod}; -use syntax::codemap::{mod, Span}; +use syntax::{self, abi, attr}; +use syntax::ast::{self, ProvidedMethod, RequiredMethod, TypeTraitItem, DefId}; +use syntax::ast_util::{self, local_def, PostExpansionMethod}; +use syntax::codemap::{self, Span}; use syntax::owned_slice::OwnedSlice; use syntax::parse::token; use syntax::print::pprust; use syntax::ptr::P; -use syntax::visit::{mod, Visitor}; +use syntax::visit::{self, Visitor}; mod assoc; pub mod _match; diff --git a/src/librustc_typeck/check/regionck.rs b/src/librustc_typeck/check/regionck.rs index 6b5f08e22dd..b5ddb528c2f 100644 --- a/src/librustc_typeck/check/regionck.rs +++ b/src/librustc_typeck/check/regionck.rs @@ -91,7 +91,7 @@ use middle::mem_categorization as mc; use middle::region::CodeExtent; use middle::traits; use middle::ty::{ReScope}; -use middle::ty::{mod, Ty, MethodCall}; +use middle::ty::{self, Ty, MethodCall}; use middle::infer; use middle::pat_util; use util::ppaux::{ty_to_string, Repr}; diff --git a/src/librustc_typeck/check/regionmanip.rs b/src/librustc_typeck/check/regionmanip.rs index 42ffe2d5327..66cf077d4c2 100644 --- a/src/librustc_typeck/check/regionmanip.rs +++ b/src/librustc_typeck/check/regionmanip.rs @@ -13,7 +13,7 @@ pub use self::WfConstraint::*; use middle::subst::{ParamSpace, Subst, Substs}; -use middle::ty::{mod, Ty}; +use middle::ty::{self, Ty}; use middle::ty_fold::{TypeFolder}; use syntax::ast; diff --git a/src/librustc_typeck/check/upvar.rs b/src/librustc_typeck/check/upvar.rs index a4c3550fcd6..2a85bfad0ad 100644 --- a/src/librustc_typeck/check/upvar.rs +++ b/src/librustc_typeck/check/upvar.rs @@ -48,7 +48,7 @@ use middle::ty::{mod}; use middle::infer::{InferCtxt, UpvarRegion}; use syntax::ast; use syntax::codemap::Span; -use syntax::visit::{mod, Visitor}; +use syntax::visit::{self, Visitor}; use util::ppaux::Repr; /////////////////////////////////////////////////////////////////////////// diff --git a/src/librustc_typeck/check/vtable.rs b/src/librustc_typeck/check/vtable.rs index 8566d1f1e12..87ede24226b 100644 --- a/src/librustc_typeck/check/vtable.rs +++ b/src/librustc_typeck/check/vtable.rs @@ -9,10 +9,10 @@ // except according to those terms. use check::{FnCtxt, structurally_resolved_type}; -use middle::traits::{mod, ObjectSafetyViolation, MethodViolationCode}; +use middle::traits::{self, ObjectSafetyViolation, MethodViolationCode}; use middle::traits::{Obligation, ObligationCause}; use middle::traits::report_fulfillment_errors; -use middle::ty::{mod, Ty, AsPredicate}; +use middle::ty::{self, Ty, AsPredicate}; use middle::infer; use syntax::ast; use syntax::codemap::Span; diff --git a/src/librustc_typeck/check/wf.rs b/src/librustc_typeck/check/wf.rs index 410697b0aca..704025f38ce 100644 --- a/src/librustc_typeck/check/wf.rs +++ b/src/librustc_typeck/check/wf.rs @@ -14,7 +14,7 @@ use CrateCtxt; use middle::region; use middle::subst; use middle::traits; -use middle::ty::{mod, Ty}; +use middle::ty::{self, Ty}; use middle::ty::liberate_late_bound_regions; use middle::ty_fold::{TypeFolder, TypeFoldable, super_fold_ty}; use util::ppaux::Repr; diff --git a/src/librustc_typeck/check/writeback.rs b/src/librustc_typeck/check/writeback.rs index 5ef9757b91a..ada7f982805 100644 --- a/src/librustc_typeck/check/writeback.rs +++ b/src/librustc_typeck/check/writeback.rs @@ -16,7 +16,7 @@ use self::ResolveReason::*; use astconv::AstConv; use check::FnCtxt; use middle::pat_util; -use middle::ty::{mod, Ty, MethodCall, MethodCallee}; +use middle::ty::{self, Ty, MethodCall, MethodCallee}; use middle::ty_fold::{TypeFolder,TypeFoldable}; use middle::infer; use write_substs_to_tcx; diff --git a/src/librustc_typeck/coherence/mod.rs b/src/librustc_typeck/coherence/mod.rs index bb308198330..45b248dac93 100644 --- a/src/librustc_typeck/coherence/mod.rs +++ b/src/librustc_typeck/coherence/mod.rs @@ -18,7 +18,7 @@ use metadata::csearch::{each_impl, get_impl_trait}; use metadata::csearch; -use middle::subst::{mod, Subst}; +use middle::subst::{self, Subst}; use middle::ty::RegionEscape; use middle::ty::{ImplContainer, ImplOrTraitItemId, MethodTraitItemId}; use middle::ty::{ParameterEnvironment, TypeTraitItemId, lookup_item_type}; diff --git a/src/librustc_typeck/coherence/overlap.rs b/src/librustc_typeck/coherence/overlap.rs index 0e74d4578d9..f618a79e27d 100644 --- a/src/librustc_typeck/coherence/overlap.rs +++ b/src/librustc_typeck/coherence/overlap.rs @@ -13,7 +13,7 @@ use middle::traits; use middle::ty; -use middle::infer::{mod, new_infer_ctxt}; +use middle::infer::{self, new_infer_ctxt}; use syntax::ast::{DefId}; use syntax::ast::{LOCAL_CRATE}; use syntax::ast; diff --git a/src/librustc_typeck/collect.rs b/src/librustc_typeck/collect.rs index 8c2cb557c1c..009f1e50e9b 100644 --- a/src/librustc_typeck/collect.rs +++ b/src/librustc_typeck/collect.rs @@ -29,7 +29,7 @@ bounds for each parameter. Type parameters themselves are represented as `ty_param()` instances. */ -use astconv::{mod, AstConv, ty_of_arg, ast_ty_to_ty, ast_region_to_region}; +use astconv::{self, AstConv, ty_of_arg, ast_ty_to_ty, ast_region_to_region}; use metadata::csearch; use middle::lang_items::SizedTraitLangItem; use middle::region; @@ -37,8 +37,8 @@ use middle::resolve_lifetime; use middle::subst; use middle::subst::{Substs}; use middle::ty::{AsPredicate, ImplContainer, ImplOrTraitItemContainer, TraitContainer}; -use middle::ty::{mod, RegionEscape, Ty, TypeScheme}; -use middle::ty_fold::{mod, TypeFolder, TypeFoldable}; +use middle::ty::{self, RegionEscape, Ty, TypeScheme}; +use middle::ty_fold::{self, TypeFolder, TypeFoldable}; use middle::infer; use rscope::*; use {CrateCtxt, no_params, write_ty_to_tcx}; diff --git a/src/librustc_typeck/lib.rs b/src/librustc_typeck/lib.rs index cc5b1f635e3..48f9b129719 100644 --- a/src/librustc_typeck/lib.rs +++ b/src/librustc_typeck/lib.rs @@ -93,7 +93,7 @@ use middle::def; use middle::infer; use middle::subst; use middle::subst::VecPerParamSpace; -use middle::ty::{mod, Ty}; +use middle::ty::{self, Ty}; use session::config; use util::common::time; use util::ppaux::Repr; diff --git a/src/librustc_typeck/variance.rs b/src/librustc_typeck/variance.rs index a17f3b31be3..a8bc01a36fe 100644 --- a/src/librustc_typeck/variance.rs +++ b/src/librustc_typeck/variance.rs @@ -196,7 +196,7 @@ use arena::Arena; use middle::resolve_lifetime as rl; use middle::subst; use middle::subst::{ParamSpace, FnSpace, TypeSpace, SelfSpace, VecPerParamSpace}; -use middle::ty::{mod, Ty}; +use middle::ty::{self, Ty}; use std::fmt; use std::rc::Rc; use std::iter::repeat; diff --git a/src/librustdoc/clean/mod.rs b/src/librustdoc/clean/mod.rs index 459d6409f67..f60334292d6 100644 --- a/src/librustdoc/clean/mod.rs +++ b/src/librustdoc/clean/mod.rs @@ -34,7 +34,7 @@ use syntax::ast_util::PostExpansionMethod; use syntax::attr; use syntax::attr::{AttributeMethods, AttrMetaMethods}; use syntax::codemap::{DUMMY_SP, Pos, Spanned}; -use syntax::parse::token::{mod, InternedString, special_idents}; +use syntax::parse::token::{self, InternedString, special_idents}; use syntax::ptr::P; use rustc_trans::back::link; @@ -42,7 +42,7 @@ use rustc::metadata::cstore; use rustc::metadata::csearch; use rustc::metadata::decoder; use rustc::middle::def; -use rustc::middle::subst::{mod, ParamSpace, VecPerParamSpace}; +use rustc::middle::subst::{self, ParamSpace, VecPerParamSpace}; use rustc::middle::ty; use rustc::middle::stability; use rustc::session::config; diff --git a/src/librustdoc/core.rs b/src/librustdoc/core.rs index 2416eb2869e..a69437f7a66 100644 --- a/src/librustdoc/core.rs +++ b/src/librustdoc/core.rs @@ -10,7 +10,7 @@ pub use self::MaybeTyped::*; use rustc_driver::driver; -use rustc::session::{mod, config}; +use rustc::session::{self, config}; use rustc::session::search_paths::SearchPaths; use rustc::middle::{privacy, ty}; use rustc::lint; diff --git a/src/librustdoc/html/render.rs b/src/librustdoc/html/render.rs index 0cfc1042ae6..fd9ada365bc 100644 --- a/src/librustdoc/html/render.rs +++ b/src/librustdoc/html/render.rs @@ -35,7 +35,7 @@ pub use self::ExternalLocation::*; use std::cell::RefCell; -use std::cmp::Ordering::{mod, Less, Greater, Equal}; +use std::cmp::Ordering::{self, Less, Greater, Equal}; use std::collections::hash_map::Entry::{Occupied, Vacant}; use std::collections::{HashMap, HashSet}; use std::default::Default; diff --git a/src/librustdoc/lib.rs b/src/librustdoc/lib.rs index f0feb8de1ce..125bc21d79d 100644 --- a/src/librustdoc/lib.rs +++ b/src/librustdoc/lib.rs @@ -44,7 +44,7 @@ use std::io; use std::rc::Rc; use externalfiles::ExternalHtml; use serialize::Decodable; -use serialize::json::{mod, Json}; +use serialize::json::{self, Json}; use rustc::session::search_paths::SearchPaths; // reexported from `clean` so it can be easily updated with the mod itself diff --git a/src/librustdoc/test.rs b/src/librustdoc/test.rs index 743c8b240d1..bded371e500 100644 --- a/src/librustdoc/test.rs +++ b/src/librustdoc/test.rs @@ -20,7 +20,7 @@ use std::thunk::Thunk; use std::collections::{HashSet, HashMap}; use testing; -use rustc::session::{mod, config}; +use rustc::session::{self, config}; use rustc::session::search_paths::{SearchPaths, PathKind}; use rustc_driver::driver; use syntax::ast; diff --git a/src/libserialize/json.rs b/src/libserialize/json.rs index 71117c7fe12..f8f6f8c02b2 100644 --- a/src/libserialize/json.rs +++ b/src/libserialize/json.rs @@ -114,7 +114,7 @@ //! ```notrust //! // FIXME(#19470): this cannot be ```rust``` because it fails orphan checking at the moment //! extern crate serialize; -//! use serialize::json::{mod, ToJson, Json}; +//! use serialize::json::{self, ToJson, Json}; //! //! // A custom data structure //! struct ComplexNum { @@ -155,7 +155,7 @@ //! // FIXME(#19470): this cannot be ```rust``` because it fails orphan checking at the moment //! extern crate serialize; //! use std::collections::BTreeMap; -//! use serialize::json::{mod, Json, ToJson}; +//! use serialize::json::{self, Json, ToJson}; //! //! // Only generate `Decodable` trait implementation //! #[deriving(Decodable)] diff --git a/src/libstd/c_str.rs b/src/libstd/c_str.rs index 834a9f082d0..f81f23885f5 100644 --- a/src/libstd/c_str.rs +++ b/src/libstd/c_str.rs @@ -77,7 +77,7 @@ use fmt; use hash; use mem; use ptr; -use slice::{mod, IntSliceExt}; +use slice::{self, IntSliceExt}; use str; use string::String; use core::kinds::marker; diff --git a/src/libstd/collections/hash/map.rs b/src/libstd/collections/hash/map.rs index f246e9df3b9..20e46845f0a 100644 --- a/src/libstd/collections/hash/map.rs +++ b/src/libstd/collections/hash/map.rs @@ -18,11 +18,11 @@ use borrow::BorrowFrom; use clone::Clone; use cmp::{max, Eq, Equiv, PartialEq}; use default::Default; -use fmt::{mod, Show}; +use fmt::{self, Show}; use hash::{Hash, Hasher, RandomSipHasher}; -use iter::{mod, Iterator, IteratorExt, FromIterator, Extend, Map}; +use iter::{self, Iterator, IteratorExt, FromIterator, Extend, Map}; use kinds::Sized; -use mem::{mod, replace}; +use mem::{self, replace}; use num::{Int, UnsignedInt}; use ops::{Deref, FnMut, Index, IndexMut}; use option::Option; @@ -31,7 +31,7 @@ use result::Result; use result::Result::{Ok, Err}; use super::table::{ - mod, + self, Bucket, EmptyBucket, FullBucket, diff --git a/src/libstd/collections/hash/set.rs b/src/libstd/collections/hash/set.rs index 4c6a74a78d5..556e0e61d2d 100644 --- a/src/libstd/collections/hash/set.rs +++ b/src/libstd/collections/hash/set.rs @@ -23,7 +23,7 @@ use ops::{BitOr, BitAnd, BitXor, Sub}; use option::Option::{Some, None, mod}; use result::Result::{Ok, Err}; -use super::map::{mod, HashMap, Keys, INITIAL_CAPACITY}; +use super::map::{self, HashMap, Keys, INITIAL_CAPACITY}; // Future Optimization (FIXME!) // ============================= diff --git a/src/libstd/io/mem.rs b/src/libstd/io/mem.rs index ad921e43c0c..a4012b743a0 100644 --- a/src/libstd/io/mem.rs +++ b/src/libstd/io/mem.rs @@ -19,7 +19,7 @@ use option::Option::None; use result::Result::{Err, Ok}; use io; use io::{Reader, Writer, Seek, Buffer, IoError, SeekStyle, IoResult}; -use slice::{mod, AsSlice, SliceExt}; +use slice::{self, AsSlice, SliceExt}; use vec::Vec; const BUF_CAPACITY: uint = 128; diff --git a/src/libstd/io/net/ip.rs b/src/libstd/io/net/ip.rs index eeb858a1887..ba746c0109c 100644 --- a/src/libstd/io/net/ip.rs +++ b/src/libstd/io/net/ip.rs @@ -18,7 +18,7 @@ pub use self::IpAddr::*; use fmt; -use io::{mod, IoResult, IoError}; +use io::{self, IoResult, IoError}; use io::net; use iter::{Iterator, IteratorExt}; use ops::FnOnce; diff --git a/src/libstd/num/strconv.rs b/src/libstd/num/strconv.rs index 6c64251091a..c2d2fe2bec3 100644 --- a/src/libstd/num/strconv.rs +++ b/src/libstd/num/strconv.rs @@ -16,8 +16,8 @@ use self::ExponentFormat::*; use self::SignificantDigits::*; use self::SignFormat::*; -use char::{mod, Char}; -use num::{mod, Int, Float, ToPrimitive}; +use char::{self, Char}; +use num::{self, Int, Float, ToPrimitive}; use num::FpCategory as Fp; use ops::FnMut; use slice::SliceExt; diff --git a/src/libstd/path/posix.rs b/src/libstd/path/posix.rs index 39b96ef6aee..067595c5199 100644 --- a/src/libstd/path/posix.rs +++ b/src/libstd/path/posix.rs @@ -450,10 +450,10 @@ mod tests { use clone::Clone; use iter::IteratorExt; - use option::Option::{mod, Some, None}; + use option::Option::{self, Some, None}; use path::GenericPath; use slice::{AsSlice, SliceExt}; - use str::{mod, Str, StrExt}; + use str::{self, Str, StrExt}; use string::ToString; use vec::Vec; diff --git a/src/libstd/path/windows.rs b/src/libstd/path/windows.rs index f6fb149e82c..6c355634c06 100644 --- a/src/libstd/path/windows.rs +++ b/src/libstd/path/windows.rs @@ -1125,7 +1125,7 @@ mod tests { use clone::Clone; use iter::IteratorExt; - use option::Option::{mod, Some, None}; + use option::Option::{self, Some, None}; use path::GenericPath; use slice::{AsSlice, SliceExt}; use str::Str; diff --git a/src/libstd/prelude/v1.rs b/src/libstd/prelude/v1.rs index 2d2f3f895d0..a122cb81b8c 100644 --- a/src/libstd/prelude/v1.rs +++ b/src/libstd/prelude/v1.rs @@ -30,9 +30,9 @@ #[stable] #[doc(no_inline)] pub use iter::ExactSizeIterator; #[stable] #[doc(no_inline)] pub use iter::{Iterator, IteratorExt, Extend}; #[stable] #[doc(no_inline)] pub use iter::{IteratorCloneExt, IteratorOrdExt}; -#[stable] #[doc(no_inline)] pub use option::Option::{mod, Some, None}; +#[stable] #[doc(no_inline)] pub use option::Option::{self, Some, None}; #[stable] #[doc(no_inline)] pub use ptr::{PtrExt, MutPtrExt}; -#[stable] #[doc(no_inline)] pub use result::Result::{mod, Ok, Err}; +#[stable] #[doc(no_inline)] pub use result::Result::{self, Ok, Err}; #[stable] #[doc(no_inline)] pub use slice::AsSlice; #[stable] #[doc(no_inline)] pub use slice::{SliceExt, SliceConcatExt}; #[stable] #[doc(no_inline)] pub use str::{Str, StrExt}; diff --git a/src/libstd/rt/mod.rs b/src/libstd/rt/mod.rs index 68aaa1b3ae5..2b0639c5705 100644 --- a/src/libstd/rt/mod.rs +++ b/src/libstd/rt/mod.rs @@ -66,7 +66,7 @@ fn lang_start(main: *const u8, argc: int, argv: *const *const u8) -> int { use mem; use os; use rt; - use sys_common::thread_info::{mod, NewThread}; + use sys_common::thread_info::{self, NewThread}; use sys_common; use thread::Thread; diff --git a/src/libstd/rt/util.rs b/src/libstd/rt/util.rs index 09859cab536..d6cf35ee3cd 100644 --- a/src/libstd/rt/util.rs +++ b/src/libstd/rt/util.rs @@ -15,7 +15,7 @@ use prelude::v1::*; use cmp; use fmt; use intrinsics; -use libc::{mod, uintptr_t}; +use libc::{self, uintptr_t}; use os; use slice; use str; diff --git a/src/libstd/sync/atomic.rs b/src/libstd/sync/atomic.rs index d4d7607bde3..3652b45ce97 100644 --- a/src/libstd/sync/atomic.rs +++ b/src/libstd/sync/atomic.rs @@ -104,7 +104,7 @@ pub use core::atomic::{AtomicBool, AtomicInt, AtomicUint, AtomicPtr}; pub use core::atomic::{INIT_ATOMIC_BOOL, INIT_ATOMIC_INT, INIT_ATOMIC_UINT}; pub use core::atomic::{ATOMIC_BOOL_INIT, ATOMIC_INT_INIT, ATOMIC_UINT_INIT}; pub use core::atomic::fence; -pub use core::atomic::Ordering::{mod, Relaxed, Release, Acquire, AcqRel, SeqCst}; +pub use core::atomic::Ordering::{self, Relaxed, Release, Acquire, AcqRel, SeqCst}; /// An atomic, nullable unique pointer /// diff --git a/src/libstd/sync/condvar.rs b/src/libstd/sync/condvar.rs index 19b8f5e62cf..28c36922ca6 100644 --- a/src/libstd/sync/condvar.rs +++ b/src/libstd/sync/condvar.rs @@ -10,8 +10,8 @@ use prelude::v1::*; -use sync::atomic::{mod, AtomicUint}; -use sync::poison::{mod, LockResult}; +use sync::atomic::{self, AtomicUint}; +use sync::poison::{self, LockResult}; use sys_common::condvar as sys; use sys_common::mutex as sys_mutex; use time::Duration; diff --git a/src/libstd/sync/mpsc/oneshot.rs b/src/libstd/sync/mpsc/oneshot.rs index 5f599752a46..2811f403c6c 100644 --- a/src/libstd/sync/mpsc/oneshot.rs +++ b/src/libstd/sync/mpsc/oneshot.rs @@ -40,7 +40,7 @@ use self::MyUpgrade::*; use core::prelude::*; use sync::mpsc::Receiver; -use sync::mpsc::blocking::{mod, SignalToken}; +use sync::mpsc::blocking::{self, SignalToken}; use core::mem; use sync::atomic; diff --git a/src/libstd/sync/mpsc/select.rs b/src/libstd/sync/mpsc/select.rs index 3d9dca7e21c..f8197622f40 100644 --- a/src/libstd/sync/mpsc/select.rs +++ b/src/libstd/sync/mpsc/select.rs @@ -62,7 +62,7 @@ use core::mem; use core::uint; use sync::mpsc::{Receiver, RecvError}; -use sync::mpsc::blocking::{mod, SignalToken}; +use sync::mpsc::blocking::{self, SignalToken}; /// The "receiver set" of the select interface. This structure is used to manage /// a set of receivers which are being selected over. diff --git a/src/libstd/sync/mpsc/shared.rs b/src/libstd/sync/mpsc/shared.rs index e15c38cf9a1..cadac8e6272 100644 --- a/src/libstd/sync/mpsc/shared.rs +++ b/src/libstd/sync/mpsc/shared.rs @@ -27,7 +27,7 @@ use core::int; use sync::{atomic, Mutex, MutexGuard}; use sync::mpsc::mpsc_queue as mpsc; -use sync::mpsc::blocking::{mod, SignalToken}; +use sync::mpsc::blocking::{self, SignalToken}; use sync::mpsc::select::StartResult; use sync::mpsc::select::StartResult::*; use thread::Thread; diff --git a/src/libstd/sync/mpsc/stream.rs b/src/libstd/sync/mpsc/stream.rs index 01b799283ee..c526e6acb8f 100644 --- a/src/libstd/sync/mpsc/stream.rs +++ b/src/libstd/sync/mpsc/stream.rs @@ -28,7 +28,7 @@ use core::cmp; use core::int; use thread::Thread; -use sync::mpsc::blocking::{mod, SignalToken}; +use sync::mpsc::blocking::{self, SignalToken}; use sync::mpsc::spsc_queue as spsc; use sync::mpsc::Receiver; use sync::atomic; diff --git a/src/libstd/sync/mpsc/sync.rs b/src/libstd/sync/mpsc/sync.rs index 98f1c4c46f9..ce5781dbc03 100644 --- a/src/libstd/sync/mpsc/sync.rs +++ b/src/libstd/sync/mpsc/sync.rs @@ -42,8 +42,8 @@ use vec::Vec; use core::mem; use sync::{atomic, Mutex, MutexGuard}; -use sync::mpsc::blocking::{mod, WaitToken, SignalToken}; -use sync::mpsc::select::StartResult::{mod, Installed, Abort}; +use sync::mpsc::blocking::{self, WaitToken, SignalToken}; +use sync::mpsc::select::StartResult::{self, Installed, Abort}; pub struct Packet { /// Only field outside of the mutex. Just done for kicks, but mainly because diff --git a/src/libstd/sync/mutex.rs b/src/libstd/sync/mutex.rs index f9f9a809221..b158bd69c7b 100644 --- a/src/libstd/sync/mutex.rs +++ b/src/libstd/sync/mutex.rs @@ -13,7 +13,7 @@ use prelude::v1::*; use cell::UnsafeCell; use kinds::marker; use ops::{Deref, DerefMut}; -use sync::poison::{mod, TryLockError, TryLockResult, LockResult}; +use sync::poison::{self, TryLockError, TryLockResult, LockResult}; use sys_common::mutex as sys; /// A mutual exclusion primitive useful for protecting shared data diff --git a/src/libstd/sync/rwlock.rs b/src/libstd/sync/rwlock.rs index 431aeb9cae9..b2367ff8352 100644 --- a/src/libstd/sync/rwlock.rs +++ b/src/libstd/sync/rwlock.rs @@ -13,7 +13,7 @@ use prelude::v1::*; use cell::UnsafeCell; use kinds::marker; use ops::{Deref, DerefMut}; -use sync::poison::{mod, LockResult, TryLockError, TryLockResult}; +use sync::poison::{self, LockResult, TryLockError, TryLockResult}; use sys_common::rwlock as sys; /// A reader-writer lock @@ -362,7 +362,7 @@ impl<'a, T> Drop for RWLockWriteGuard<'a, T> { mod tests { use prelude::v1::*; - use rand::{mod, Rng}; + use rand::{self, Rng}; use sync::mpsc::channel; use thread::Thread; use sync::{Arc, RWLock, StaticRWLock, RWLOCK_INIT}; diff --git a/src/libstd/sys/common/condvar.rs b/src/libstd/sys/common/condvar.rs index e09d9704029..32fa6ec5903 100644 --- a/src/libstd/sys/common/condvar.rs +++ b/src/libstd/sys/common/condvar.rs @@ -9,7 +9,7 @@ // except according to those terms. use time::Duration; -use sys_common::mutex::{mod, Mutex}; +use sys_common::mutex::{self, Mutex}; use sys::condvar as imp; /// An OS-based condition variable. diff --git a/src/libstd/sys/common/mod.rs b/src/libstd/sys/common/mod.rs index 97015f74a4a..a441e55a732 100644 --- a/src/libstd/sys/common/mod.rs +++ b/src/libstd/sys/common/mod.rs @@ -11,7 +11,7 @@ #![allow(missing_docs)] #![allow(dead_code)] -use io::{mod, IoError, IoResult}; +use io::{self, IoError, IoResult}; use prelude::v1::*; use sys::{last_error, retry}; use c_str::CString; diff --git a/src/libstd/sys/common/net.rs b/src/libstd/sys/common/net.rs index 94a2c9b78fa..86833af5654 100644 --- a/src/libstd/sys/common/net.rs +++ b/src/libstd/sys/common/net.rs @@ -16,16 +16,16 @@ use c_str::ToCStr; use io::net::addrinfo; use io::net::ip::{SocketAddr, IpAddr, Ipv4Addr, Ipv6Addr}; use io::{IoResult, IoError}; -use libc::{mod, c_char, c_int}; +use libc::{self, c_char, c_int}; use c_str::CString; use mem; use num::Int; -use ptr::{mod, null, null_mut}; -use sys::{mod, retry, c, sock_t, last_error, last_net_error, last_gai_error, close_sock, +use ptr::{self, null, null_mut}; +use sys::{self, retry, c, sock_t, last_error, last_net_error, last_gai_error, close_sock, wrlen, msglen_t, os, wouldblock, set_nonblocking, timer, ms_to_timeval, decode_error_detailed}; use sync::{Arc, Mutex, MutexGuard}; -use sys_common::{mod, keep_going, short_write, timeout}; +use sys_common::{self, keep_going, short_write, timeout}; use cmp; use io; diff --git a/src/libstd/sys/common/thread_local.rs b/src/libstd/sys/common/thread_local.rs index 9d7188a37bc..158fd3a8382 100644 --- a/src/libstd/sys/common/thread_local.rs +++ b/src/libstd/sys/common/thread_local.rs @@ -58,7 +58,7 @@ use prelude::v1::*; -use sync::atomic::{mod, AtomicUint}; +use sync::atomic::{self, AtomicUint}; use sync::{Mutex, Once, ONCE_INIT}; use sys::thread_local as imp; diff --git a/src/libstd/sys/unix/backtrace.rs b/src/libstd/sys/unix/backtrace.rs index 9e26475f814..5b261ea6b9e 100644 --- a/src/libstd/sys/unix/backtrace.rs +++ b/src/libstd/sys/unix/backtrace.rs @@ -87,7 +87,7 @@ use c_str::CString; use io::{IoResult, Writer}; use libc; use mem; -use option::Option::{mod, Some, None}; +use option::Option::{self, Some, None}; use result::Result::{Ok, Err}; use sync::{StaticMutex, MUTEX_INIT}; diff --git a/src/libstd/sys/unix/condvar.rs b/src/libstd/sys/unix/condvar.rs index f64718539ef..3aa4825f3be 100644 --- a/src/libstd/sys/unix/condvar.rs +++ b/src/libstd/sys/unix/condvar.rs @@ -10,7 +10,7 @@ use cell::UnsafeCell; use libc; -use sys::mutex::{mod, Mutex}; +use sys::mutex::{self, Mutex}; use sys::sync as ffi; use time::Duration; diff --git a/src/libstd/sys/unix/fs.rs b/src/libstd/sys/unix/fs.rs index e3e0b279c12..b49ace8e2f8 100644 --- a/src/libstd/sys/unix/fs.rs +++ b/src/libstd/sys/unix/fs.rs @@ -17,7 +17,7 @@ use io::{FilePermission, Write, UnstableFileStat, Open, FileAccess, FileMode}; use io::{IoResult, FileStat, SeekStyle}; use io::{Read, Truncate, SeekCur, SeekSet, ReadWrite, SeekEnd, Append}; use io; -use libc::{mod, c_int, c_void}; +use libc::{self, c_int, c_void}; use mem; use sys::retry; use sys_common::{keep_going, eof, mkerr_libc}; diff --git a/src/libstd/sys/unix/mod.rs b/src/libstd/sys/unix/mod.rs index 4199cbc1bb9..ea0d230e8b2 100644 --- a/src/libstd/sys/unix/mod.rs +++ b/src/libstd/sys/unix/mod.rs @@ -20,7 +20,7 @@ extern crate libc; use num; use num::{Int, SignedInt}; use prelude::v1::*; -use io::{mod, IoResult, IoError}; +use io::{self, IoResult, IoError}; use sys_common::mkerr_libc; macro_rules! helper_init { (static $name:ident: Helper<$m:ty>) => ( diff --git a/src/libstd/sys/unix/os.rs b/src/libstd/sys/unix/os.rs index 6a8f55e79c8..690574301d7 100644 --- a/src/libstd/sys/unix/os.rs +++ b/src/libstd/sys/unix/os.rs @@ -16,7 +16,7 @@ use c_str::ToCStr; use error::{FromError, Error}; use fmt; use io::{IoError, IoResult}; -use libc::{mod, c_int, c_char, c_void}; +use libc::{self, c_int, c_char, c_void}; use os; use path::{BytesContainer}; use ptr; diff --git a/src/libstd/sys/unix/pipe.rs b/src/libstd/sys/unix/pipe.rs index 623f3f6a89c..fcbfb383d3c 100644 --- a/src/libstd/sys/unix/pipe.rs +++ b/src/libstd/sys/unix/pipe.rs @@ -14,9 +14,9 @@ use libc; use c_str::CString; use mem; use sync::{atomic, Arc, Mutex}; -use io::{mod, IoResult, IoError}; +use io::{self, IoResult, IoError}; -use sys::{mod, timer, retry, c, set_nonblocking, wouldblock}; +use sys::{self, timer, retry, c, set_nonblocking, wouldblock}; use sys::fs::{fd_t, FileDesc}; use sys_common::net::*; use sys_common::net::SocketStatus::*; diff --git a/src/libstd/sys/unix/process.rs b/src/libstd/sys/unix/process.rs index af09bf4fbd0..b73919fe2a2 100644 --- a/src/libstd/sys/unix/process.rs +++ b/src/libstd/sys/unix/process.rs @@ -15,15 +15,15 @@ use c_str::{CString, ToCStr}; use collections; use hash::Hash; use io::process::{ProcessExit, ExitStatus, ExitSignal}; -use io::{mod, IoResult, IoError, EndOfFile}; -use libc::{mod, pid_t, c_void, c_int}; +use io::{self, IoResult, IoError, EndOfFile}; +use libc::{self, pid_t, c_void, c_int}; use mem; use os; use path::BytesContainer; use ptr; use sync::mpsc::{channel, Sender, Receiver}; use sys::fs::FileDesc; -use sys::{mod, retry, c, wouldblock, set_nonblocking, ms_to_timeval}; +use sys::{self, retry, c, wouldblock, set_nonblocking, ms_to_timeval}; use sys_common::helper_thread::Helper; use sys_common::{AsInner, mkerr_libc, timeout}; diff --git a/src/libstd/sys/unix/tty.rs b/src/libstd/sys/unix/tty.rs index 4ef687d41d8..bee3d440a16 100644 --- a/src/libstd/sys/unix/tty.rs +++ b/src/libstd/sys/unix/tty.rs @@ -11,8 +11,8 @@ use prelude::v1::*; use sys::fs::FileDesc; -use libc::{mod, c_int}; -use io::{mod, IoResult, IoError}; +use libc::{self, c_int}; +use io::{self, IoResult, IoError}; use sys_common; pub struct TTY { diff --git a/src/libstd/sys/windows/condvar.rs b/src/libstd/sys/windows/condvar.rs index 7f9d669c447..291a8024cfc 100644 --- a/src/libstd/sys/windows/condvar.rs +++ b/src/libstd/sys/windows/condvar.rs @@ -9,9 +9,9 @@ // except according to those terms. use cell::UnsafeCell; -use libc::{mod, DWORD}; +use libc::{self, DWORD}; use os; -use sys::mutex::{mod, Mutex}; +use sys::mutex::{self, Mutex}; use sys::sync as ffi; use time::Duration; diff --git a/src/libstd/sys/windows/fs.rs b/src/libstd/sys/windows/fs.rs index 523d60c71aa..9a942300656 100644 --- a/src/libstd/sys/windows/fs.rs +++ b/src/libstd/sys/windows/fs.rs @@ -11,7 +11,7 @@ //! Blocking Windows-based file I/O use alloc::arc::Arc; -use libc::{mod, c_int}; +use libc::{self, c_int}; use c_str::CString; use mem; diff --git a/src/libstd/sys/windows/helper_signal.rs b/src/libstd/sys/windows/helper_signal.rs index c547c79e83a..a9fb2c68227 100644 --- a/src/libstd/sys/windows/helper_signal.rs +++ b/src/libstd/sys/windows/helper_signal.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -use libc::{mod, BOOL, LPCSTR, HANDLE, LPSECURITY_ATTRIBUTES, CloseHandle}; +use libc::{self, BOOL, LPCSTR, HANDLE, LPSECURITY_ATTRIBUTES, CloseHandle}; use ptr; pub type signal = HANDLE; diff --git a/src/libstd/sys/windows/mod.rs b/src/libstd/sys/windows/mod.rs index 1034f0615d9..0e706c3cc6a 100644 --- a/src/libstd/sys/windows/mod.rs +++ b/src/libstd/sys/windows/mod.rs @@ -22,7 +22,7 @@ use prelude::v1::*; use num; use mem; -use io::{mod, IoResult, IoError}; +use io::{self, IoResult, IoError}; use sync::{Once, ONCE_INIT}; macro_rules! helper_init { (static $name:ident: Helper<$m:ty>) => ( diff --git a/src/libstd/sys/windows/mutex.rs b/src/libstd/sys/windows/mutex.rs index e0fa02b5599..f561e0121b3 100644 --- a/src/libstd/sys/windows/mutex.rs +++ b/src/libstd/sys/windows/mutex.rs @@ -11,7 +11,7 @@ use prelude::v1::*; use sync::atomic; -use alloc::{mod, heap}; +use alloc::{self, heap}; use libc::DWORD; use sys::sync as ffi; diff --git a/src/libstd/sys/windows/pipe.rs b/src/libstd/sys/windows/pipe.rs index f173d5fc6d4..0edae75a9ce 100644 --- a/src/libstd/sys/windows/pipe.rs +++ b/src/libstd/sys/windows/pipe.rs @@ -91,9 +91,9 @@ use c_str::CString; use mem; use ptr; use sync::{atomic, Arc, Mutex}; -use io::{mod, IoError, IoResult}; +use io::{self, IoError, IoResult}; -use sys_common::{mod, eof}; +use sys_common::{self, eof}; use super::{c, os, timer, to_utf16, decode_error_detailed}; diff --git a/src/libstd/sys/windows/process.rs b/src/libstd/sys/windows/process.rs index cb99a886ce4..81e8f974a12 100644 --- a/src/libstd/sys/windows/process.rs +++ b/src/libstd/sys/windows/process.rs @@ -24,7 +24,7 @@ use hash::Hash; use io::{IoResult, IoError}; use sys::fs; -use sys::{mod, retry, c, wouldblock, set_nonblocking, ms_to_timeval, timer}; +use sys::{self, retry, c, wouldblock, set_nonblocking, ms_to_timeval, timer}; use sys::fs::FileDesc; use sys_common::helper_thread::Helper; use sys_common::{AsInner, mkerr_libc, timeout}; diff --git a/src/libstd/sys/windows/tcp.rs b/src/libstd/sys/windows/tcp.rs index 5a929f6b2b5..1c8ec2a80a7 100644 --- a/src/libstd/sys/windows/tcp.rs +++ b/src/libstd/sys/windows/tcp.rs @@ -17,8 +17,8 @@ use prelude::v1::*; use super::{last_error, last_net_error, retry, sock_t}; use sync::{Arc, atomic}; use sys::fs::FileDesc; -use sys::{mod, c, set_nonblocking, wouldblock, timer}; -use sys_common::{mod, timeout, eof, net}; +use sys::{self, c, set_nonblocking, wouldblock, timer}; +use sys_common::{self, timeout, eof, net}; pub use sys_common::net::TcpStream; diff --git a/src/libstd/sys/windows/tty.rs b/src/libstd/sys/windows/tty.rs index 7591025d76d..4305f7743b5 100644 --- a/src/libstd/sys/windows/tty.rs +++ b/src/libstd/sys/windows/tty.rs @@ -27,7 +27,7 @@ use prelude::v1::*; -use io::{mod, IoError, IoResult, MemReader}; +use io::{self, IoError, IoResult, MemReader}; use iter::repeat; use libc::types::os::arch::extra::LPCVOID; use libc::{c_int, HANDLE, LPDWORD, DWORD, LPVOID}; diff --git a/src/libstd/thread.rs b/src/libstd/thread.rs index 3c87309dabc..097ecf338d3 100644 --- a/src/libstd/thread.rs +++ b/src/libstd/thread.rs @@ -131,12 +131,12 @@ use cell::UnsafeCell; use clone::Clone; use kinds::{Send, Sync}; use ops::{Drop, FnOnce}; -use option::Option::{mod, Some, None}; +use option::Option::{self, Some, None}; use result::Result::{Err, Ok}; use sync::{Mutex, Condvar, Arc}; use str::Str; use string::String; -use rt::{mod, unwind}; +use rt::{self, unwind}; use io::{Writer, stdio}; use thunk::Thunk; diff --git a/src/libsyntax/ast_map/mod.rs b/src/libsyntax/ast_map/mod.rs index b1799fc2718..ea61415d61f 100644 --- a/src/libsyntax/ast_map/mod.rs +++ b/src/libsyntax/ast_map/mod.rs @@ -20,13 +20,13 @@ use fold::Folder; use parse::token; use print::pprust; use ptr::P; -use visit::{mod, Visitor}; +use visit::{self, Visitor}; use arena::TypedArena; use std::cell::RefCell; use std::fmt; use std::io::IoResult; -use std::iter::{mod, repeat}; +use std::iter::{self, repeat}; use std::mem; use std::slice; diff --git a/src/libsyntax/ext/deriving/generic/mod.rs b/src/libsyntax/ext/deriving/generic/mod.rs index acfb020fab6..55443dedfca 100644 --- a/src/libsyntax/ext/deriving/generic/mod.rs +++ b/src/libsyntax/ext/deriving/generic/mod.rs @@ -196,7 +196,7 @@ use attr; use attr::AttrMetaMethods; use ext::base::ExtCtxt; use ext::build::AstBuilder; -use codemap::{mod, DUMMY_SP}; +use codemap::{self, DUMMY_SP}; use codemap::Span; use fold::MoveMap; use owned_slice::OwnedSlice; diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index e2f86f8fd39..95badb5df25 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -65,8 +65,8 @@ use ast::{ViewItem, ViewItem_, ViewItemExternCrate, ViewItemUse}; use ast::{ViewPath, ViewPathGlob, ViewPathList, ViewPathSimple}; use ast::{Visibility, WhereClause}; use ast; -use ast_util::{mod, as_prec, ident_to_path, operator_prec}; -use codemap::{mod, Span, BytePos, Spanned, spanned, mk_sp, DUMMY_SP}; +use ast_util::{self, as_prec, ident_to_path, operator_prec}; +use codemap::{self, Span, BytePos, Spanned, spanned, mk_sp, DUMMY_SP}; use diagnostic; use ext::tt::macro_parser; use parse; @@ -75,7 +75,7 @@ use parse::classify; use parse::common::{SeqSep, seq_sep_none, seq_sep_trailing_allowed}; use parse::lexer::{Reader, TokenAndSpan}; use parse::obsolete::*; -use parse::token::{mod, MatchNt, SubstNt, InternedString}; +use parse::token::{self, MatchNt, SubstNt, InternedString}; use parse::token::{keywords, special_idents}; use parse::{new_sub_parser_from_file, ParseSess}; use print::pprust; diff --git a/src/libsyntax/print/pprust.rs b/src/libsyntax/print/pprust.rs index 64eb4192bf0..8e5766bdacc 100644 --- a/src/libsyntax/print/pprust.rs +++ b/src/libsyntax/print/pprust.rs @@ -11,7 +11,7 @@ pub use self::AnnNode::*; use abi; -use ast::{mod, FnUnboxedClosureKind, FnMutUnboxedClosureKind}; +use ast::{self, FnUnboxedClosureKind, FnMutUnboxedClosureKind}; use ast::{FnOnceUnboxedClosureKind}; use ast::{MethodImplItem, RegionTyParamBound, TraitTyParamBound, TraitBoundModifier}; use ast::{RequiredMethod, ProvidedMethod, TypeImplItem, TypeTraitItem}; @@ -19,17 +19,17 @@ use ast::{UnboxedClosureKind}; use ast_util; use owned_slice::OwnedSlice; use attr::{AttrMetaMethods, AttributeMethods}; -use codemap::{mod, CodeMap, BytePos}; +use codemap::{self, CodeMap, BytePos}; use diagnostic; -use parse::token::{mod, BinOpToken, Token}; +use parse::token::{self, BinOpToken, Token}; use parse::lexer::comments; use parse; -use print::pp::{mod, break_offset, word, space, zerobreak, hardbreak}; +use print::pp::{self, break_offset, word, space, zerobreak, hardbreak}; use print::pp::{Breaks, Consistent, Inconsistent, eof}; use ptr::P; use std::{ascii, mem}; -use std::io::{mod, IoResult}; +use std::io::{self, IoResult}; use std::iter; pub enum AnnNode<'a> { diff --git a/src/libsyntax/ptr.rs b/src/libsyntax/ptr.rs index a989b323723..6eee1d903ea 100644 --- a/src/libsyntax/ptr.rs +++ b/src/libsyntax/ptr.rs @@ -36,7 +36,7 @@ //! implementation changes (using a special thread-local heap, for example). //! Moreover, a switch to, e.g. `P<'a, T>` would be easy and mostly automated. -use std::fmt::{mod, Show}; +use std::fmt::{self, Show}; use std::hash::Hash; use std::ops::Deref; use std::ptr; diff --git a/src/libtest/lib.rs b/src/libtest/lib.rs index b2d3611fc64..6a37f2db33c 100644 --- a/src/libtest/lib.rs +++ b/src/libtest/lib.rs @@ -73,7 +73,7 @@ use std::num::{Float, FloatMath, Int}; use std::os; use std::str::{FromStr, from_str}; use std::sync::mpsc::{channel, Sender}; -use std::thread::{mod, Thread}; +use std::thread::{self, Thread}; use std::thunk::{Thunk, Invoke}; use std::time::Duration; diff --git a/src/libtest/stats.rs b/src/libtest/stats.rs index e8ab1b54843..bf42743a692 100644 --- a/src/libtest/stats.rs +++ b/src/libtest/stats.rs @@ -10,7 +10,7 @@ #![allow(missing_docs)] -use std::cmp::Ordering::{mod, Less, Greater, Equal}; +use std::cmp::Ordering::{self, Less, Greater, Equal}; use std::collections::hash_map::Entry::{Occupied, Vacant}; use std::collections::hash_map; use std::fmt::Show; diff --git a/src/libtime/lib.rs b/src/libtime/lib.rs index 7603d84848c..adb4b5300c1 100644 --- a/src/libtime/lib.rs +++ b/src/libtime/lib.rs @@ -35,7 +35,7 @@ extern crate libc; pub use self::ParseError::*; use self::Fmt::*; -use std::fmt::{mod, Show}; +use std::fmt::{self, Show}; use std::num::SignedInt; use std::ops::{Add, Sub}; use std::time::Duration; diff --git a/src/test/bench/shootout-k-nucleotide-pipes.rs b/src/test/bench/shootout-k-nucleotide-pipes.rs index d92d30ca844..44abd1d09d1 100644 --- a/src/test/bench/shootout-k-nucleotide-pipes.rs +++ b/src/test/bench/shootout-k-nucleotide-pipes.rs @@ -18,7 +18,7 @@ extern crate collections; use std::ascii::{AsciiExt, OwnedAsciiExt}; -use std::cmp::Ordering::{mod, Less, Greater, Equal}; +use std::cmp::Ordering::{self, Less, Greater, Equal}; use std::collections::HashMap; use std::sync::mpsc::{channel, Sender, Receiver}; use std::mem::replace;