---

yaml
---
r: 171133
b: refs/heads/batch
c: 8c5bb80
h: refs/heads/master
i:
  171131: 0e8912e
v: v3

Author: Jorge Aparicio

[refs]

@@ -29,7 +29,7 @@ refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
 refs/heads/issue-18208-method-dispatch-2: 9e1eae4fb9b6527315b4441cf8a0f5ca911d1671
 refs/heads/automation-fail: 1bf06495443584539b958873e04cc2f864ab10e4
 refs/heads/issue-18208-method-dispatch-3-quick-reject: 2009f85b9f99dedcec4404418eda9ddba90258a2
-refs/heads/batch: 56dcbd17fdad5d39b7b02e22a7490d2468718d08
+refs/heads/batch: 8c5bb80d9b8373dd3c14cde0ba79f7d507839782
 refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
 refs/heads/beta: 496dc4eae7de9d14cd49511a9acfbf5f11ae6c3f
 refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928

branches/batch/src/libcore/slice.rs

@@ -43,7 +43,7 @@ use default::Default;
 use iter::*;
 use kinds::Copy;
 use num::Int;
-use ops::{FnMut, mod};
+use ops::{FnMut, self};
 use option::Option;
 use option::Option::{None, Some};
 use result::Result;

branches/batch/src/librustc/middle/const_eval.rs

@@ -17,7 +17,7 @@ pub use self::constness::*;
 use metadata::csearch;
 use middle::{astencode, def};
 use middle::pat_util::def_to_path;
-use middle::ty::{mod};
+use middle::ty::{self};
 use middle::astconv_util::{ast_ty_to_prim_ty};
 use util::nodemap::DefIdMap;
 

branches/batch/src/librustc/middle/expr_use_visitor.rs

@@ -23,7 +23,7 @@ use self::OverloadedCallType::*;
 use middle::{def, region, pat_util};
 use middle::mem_categorization as mc;
 use middle::mem_categorization::Typer;
-use middle::ty::{mod};
+use middle::ty::{self};
 use middle::ty::{MethodCall, MethodObject, MethodTraitObject};
 use middle::ty::{MethodOrigin, MethodParam, MethodTypeParam};
 use middle::ty::{MethodStatic, MethodStaticUnboxedClosure};

branches/batch/src/librustc_typeck/check/method/confirm.rs

@@ -12,7 +12,7 @@ use super::probe;
 
 use check::{self, FnCtxt, NoPreference, PreferMutLvalue, callee, demand};
 use middle::mem_categorization::Typer;
-use middle::subst::{mod};
+use middle::subst::{self};
 use middle::traits;
 use middle::ty::{self, Ty};
 use middle::ty::{MethodCall, MethodCallee, MethodObject, MethodOrigin,

branches/batch/src/librustc_typeck/check/upvar.rs

@@ -44,7 +44,7 @@ use super::FnCtxt;
 
 use middle::expr_use_visitor as euv;
 use middle::mem_categorization as mc;
-use middle::ty::{mod};
+use middle::ty::{self};
 use middle::infer::{InferCtxt, UpvarRegion};
 use syntax::ast;
 use syntax::codemap::Span;

branches/batch/src/libstd/collections/hash/set.rs

@@ -20,7 +20,7 @@ use fmt;
 use hash::{Hash, Hasher, RandomSipHasher};
 use iter::{Iterator, IteratorExt, IteratorCloneExt, FromIterator, Map, Chain, Extend};
 use ops::{BitOr, BitAnd, BitXor, Sub};
-use option::Option::{Some, None, mod};
+use option::Option::{Some, None, self};
 use result::Result::{Ok, Err};
 
 use super::map::{self, HashMap, Keys, INITIAL_CAPACITY};

branches/batch/src/libsyntax/ext/deriving/cmp/eq.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use ast::{MetaItem, Item, Expr, mod};
+use ast::{MetaItem, Item, Expr, self};
 use codemap::Span;
 use ext::base::ExtCtxt;
 use ext::build::AstBuilder;

branches/batch/src/test/run-pass/associated-types-impl-redirect.rs

@@ -20,7 +20,7 @@
 #![no_implicit_prelude]
 
 use std::kinds::Sized;
-use std::option::Option::{None, Some, mod};
+use std::option::Option::{None, Some, self};
 
 trait Iterator {
     type Item;

branches/batch/src/test/run-pass/associated-types-where-clause-impl-ambiguity.rs

@@ -20,7 +20,7 @@
 #![no_implicit_prelude]
 
 use std::kinds::Sized;
-use std::option::Option::{None, Some, mod};
+use std::option::Option::{None, Some, self};
 
 trait Iterator {
     type Item;

branches/batch/src/test/run-pass/use-mod.rs

@@ -26,7 +26,7 @@ mod foo {
 }
 
 mod baz {
-    use super::foo::{bar, mod};
+    use super::foo::{bar, self};
     pub use foo::Third;
 }