---

yaml
---
r: 276597
b: refs/heads/try
c: bf94aef
h: refs/heads/master
i:
  276595: a6efff5

Author: nodakai

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 6dbb0e86aec11050480beb76eade6fb805010ba7
 refs/heads/snap-stage3: 235d77457d80b549dad3ac36d94f235208a1eafb
-refs/heads/try: 68de28b309b38c5143b3c27f3db0d57f4373729e
+refs/heads/try: bf94aefd5aa9d9cbf24d5dd82280186777669eb1
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try/mk/crates.mk

@@ -57,7 +57,7 @@ TARGET_CRATES := libc std term \
 RUSTC_CRATES := rustc rustc_typeck rustc_mir rustc_borrowck rustc_resolve rustc_driver \
                 rustc_trans rustc_back rustc_llvm rustc_privacy rustc_lint \
                 rustc_data_structures rustc_front rustc_platform_intrinsics \
-                rustc_plugin rustc_metadata rustc_passes rustc_save_analysis
+                rustc_plugin rustc_metadata rustc_passes
 HOST_CRATES := syntax syntax_ext $(RUSTC_CRATES) rustdoc fmt_macros \
 		flate arena graphviz rbml log serialize
 TOOLS := compiletest rustdoc rustc rustbook error_index_generator
@@ -102,7 +102,7 @@ DEPS_rustc_data_structures := std log serialize
 DEPS_rustc_driver := arena flate getopts graphviz libc rustc rustc_back rustc_borrowck \
                      rustc_typeck rustc_mir rustc_resolve log syntax serialize rustc_llvm \
 	             rustc_trans rustc_privacy rustc_lint rustc_front rustc_plugin \
-                     rustc_metadata syntax_ext rustc_passes rustc_save_analysis
+                     rustc_metadata syntax_ext rustc_passes
 DEPS_rustc_front := std syntax log serialize
 DEPS_rustc_lint := rustc log syntax
 DEPS_rustc_llvm := native:rustllvm libc std rustc_bitflags
@@ -116,7 +116,6 @@ DEPS_rustc_privacy := rustc rustc_front log syntax
 DEPS_rustc_trans := arena flate getopts graphviz libc rustc rustc_back rustc_mir \
                     log syntax serialize rustc_llvm rustc_front rustc_platform_intrinsics \
 					rustc_const_eval
-DEPS_rustc_save_analysis := rustc log syntax rustc_front
 DEPS_rustc_typeck := rustc syntax rustc_front rustc_platform_intrinsics rustc_const_eval
 
 DEPS_rustdoc := rustc rustc_driver native:hoedown serialize getopts \

branches/try/src/bootstrap/build/native.rs

@@ -39,7 +39,12 @@ pub fn llvm(build: &Build, target: &str) {
 
     let _ = fs::remove_dir_all(&dst.join("build"));
     t!(fs::create_dir_all(&dst.join("build")));
-    let assertions = if build.config.llvm_assertions {"ON"} else {"OFF"};
+    let mut assertions = if build.config.llvm_assertions {"ON"} else {"OFF"};
+
+    // Disable LLVM assertions on ARM compilers until #32360 is fixed
+    if target.contains("arm") && target.contains("gnu") {
+        assertions = "OFF";
+    }
 
     // http://llvm.org/docs/CMake.html
     let mut cfg = cmake::Config::new(build.src.join("src/llvm"));

branches/try/src/doc/book/strings.md

@@ -44,11 +44,6 @@ let s = "foo\
 assert_eq!("foobar", s);
 ```
 
-Note that you normally cannot access a `str` directly, but only through a `&str`
-reference. This is because `str` is an unsized type which requires additional
-runtime information to be usable. For more information see the chapter on
-[unsized types][ut].
-
 Rust has more than only `&str`s though. A `String` is a heap-allocated string.
 This string is growable, and is also guaranteed to be UTF-8. `String`s are
 commonly created by converting from a string slice using the `to_string`
@@ -190,6 +185,5 @@ let hello_world = hello + &world;
 This is because `&String` can automatically coerce to a `&str`. This is a
 feature called ‘[`Deref` coercions][dc]’.
 
-[ut]: unsized-types.html
 [dc]: deref-coercions.html
 [connect]: ../std/net/struct.TcpStream.html#method.connect

branches/try/src/doc/reference.md

@@ -3911,9 +3911,6 @@ The _heap_ is a general term that describes boxes.  The lifetime of an
 allocation in the heap depends on the lifetime of the box values pointing to
 it. Since box values may themselves be passed in and out of frames, or stored
 in the heap, heap allocations may outlive the frame they are allocated within.
-An allocation in the heap is guaranteed to reside at a single location in the
-heap for the whole lifetime of the allocation - it will never be relocated as
-a result of moving a box value.
 
 ### Memory ownership
 

branches/try/src/etc/CONFIGS.md

@@ -10,3 +10,7 @@ These are some links to repos with configs which ease the use of rust.
 * [kate-config](https://github.com/rust-lang/kate-config)
 * [nano-config](https://github.com/rust-lang/nano-config)
 * [zsh-config](https://github.com/rust-lang/zsh-config)
+
+## Community-maintained Configs
+
+* [.editorconfig](https://gist.github.com/derhuerst/c9d1b9309e308d9851fa) ([what is this?](http://editorconfig.org/))

branches/try/src/librustc/dep_graph/mod.rs

@@ -11,7 +11,7 @@
 use self::thread::{DepGraphThreadData, DepMessage};
 use middle::def_id::DefId;
 use syntax::ast::NodeId;
-use ty::TyCtxt;
+use middle::ty::TyCtxt;
 use rustc_front::hir;
 use rustc_front::intravisit::Visitor;
 use std::rc::Rc;

branches/try/src/librustc/lib.rs

@@ -78,20 +78,17 @@ pub mod back {
     pub use rustc_back::svh;
 }
 
-pub mod cfg;
 pub mod dep_graph;
 
 pub mod front {
     pub mod check_attr;
     pub mod map;
 }
 
-pub mod infer;
-pub mod lint;
-
 pub mod middle {
     pub mod astconv_util;
     pub mod expr_use_visitor; // STAGE0: increase glitch immunity
+    pub mod cfg;
     pub mod check_match;
     pub mod const_eval;
     pub mod const_qualif;
@@ -105,6 +102,7 @@ pub mod middle {
     pub mod entry;
     pub mod free_region;
     pub mod intrinsicck;
+    pub mod infer;
     pub mod lang_items;
     pub mod liveness;
     pub mod mem_categorization;
@@ -115,6 +113,9 @@ pub mod middle {
     pub mod recursion_limit;
     pub mod resolve_lifetime;
     pub mod stability;
+    pub mod subst;
+    pub mod traits;
+    pub mod ty;
     pub mod weak_lang_items;
 }
 
@@ -127,8 +128,8 @@ pub mod mir {
 }
 
 pub mod session;
-pub mod traits;
-pub mod ty;
+
+pub mod lint;
 
 pub mod util {
     pub use rustc_back::sha2;

branches/try/src/librustc/lint/context.rs

@@ -27,7 +27,7 @@ use self::TargetLint::*;
 
 use dep_graph::DepNode;
 use middle::privacy::AccessLevels;
-use ty::TyCtxt;
+use middle::ty::TyCtxt;
 use session::{config, early_error, Session};
 use lint::{Level, LevelSource, Lint, LintId, LintArray, LintPass};
 use lint::{EarlyLintPass, EarlyLintPassObject, LateLintPass, LateLintPassObject};

branches/try/src/librustc/middle/astconv_util.rs

@@ -15,7 +15,7 @@
  */
 
 use middle::def::Def;
-use ty::{Ty, TyCtxt};
+use middle::ty::{Ty, TyCtxt};
 
 use syntax::codemap::Span;
 use rustc_front::hir as ast;

branches/try/src/librustc/cfg/construct.rs renamed to branches/try/src/librustc/middle/cfg/construct.rs

@@ -9,10 +9,10 @@
 // except according to those terms.
 
 use rustc_data_structures::graph;
-use cfg::*;
+use middle::cfg::*;
 use middle::def::Def;
 use middle::pat_util;
-use ty::{self, TyCtxt};
+use middle::ty::{self, TyCtxt};
 use syntax::ast;
 use syntax::ptr::P;
 

branches/try/src/librustc/cfg/graphviz.rs renamed to branches/try/src/librustc/middle/cfg/graphviz.rs

@@ -18,7 +18,7 @@ use graphviz::IntoCow;
 use syntax::ast;
 
 use front::map as ast_map;
-use cfg;
+use middle::cfg;
 
 pub type Node<'a> = (cfg::CFGIndex, &'a cfg::CFGNode);
 pub type Edge<'a> = &'a cfg::CFGEdge;

branches/try/src/librustc/cfg/mod.rs renamed to branches/try/src/librustc/middle/cfg/mod.rs

@@ -12,7 +12,7 @@
 //! Uses `Graph` as the underlying representation.
 
 use rustc_data_structures::graph;
-use ty::TyCtxt;
+use middle::ty::TyCtxt;
 use syntax::ast;
 use rustc_front::hir;
 

branches/try/src/librustc/middle/check_match.rs

@@ -22,12 +22,12 @@ use middle::def_id::{DefId};
 use middle::expr_use_visitor::{ConsumeMode, Delegate, ExprUseVisitor};
 use middle::expr_use_visitor::{LoanCause, MutateMode};
 use middle::expr_use_visitor as euv;
-use infer;
+use middle::infer;
 use middle::mem_categorization::{cmt};
 use middle::pat_util::*;
-use traits::ProjectionMode;
-use ty::*;
-use ty;
+use middle::traits::ProjectionMode;
+use middle::ty::*;
+use middle::ty;
 use std::cmp::Ordering;
 use std::fmt;
 use std::iter::{FromIterator, IntoIterator, repeat};

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

@@ -18,13 +18,13 @@ use front::map as ast_map;
 use front::map::blocks::FnLikeNode;
 use lint;
 use middle::cstore::{self, CrateStore, InlinedItem};
-use {infer, traits};
+use middle::{infer, subst, traits};
 use middle::def::Def;
 use middle::def_id::DefId;
 use middle::pat_util::def_to_path;
-use ty::{self, subst, Ty, TyCtxt};
-use ty::util::IntTypeExt;
-use traits::ProjectionMode;
+use middle::ty::{self, Ty, TyCtxt};
+use middle::ty::util::IntTypeExt;
+use middle::traits::ProjectionMode;
 use middle::astconv_util::ast_ty_to_prim_ty;
 use util::nodemap::NodeMap;
 

branches/try/src/librustc/middle/cstore.rs

@@ -26,7 +26,7 @@ use back::svh::Svh;
 use front::map as hir_map;
 use middle::def::{self, Def};
 use middle::lang_items;
-use ty::{self, Ty, TyCtxt, VariantKind};
+use middle::ty::{self, Ty, TyCtxt, VariantKind};
 use middle::def_id::{DefId, DefIndex};
 use mir::repr::Mir;
 use mir::mir_map::MirMap;
@@ -498,8 +498,8 @@ pub mod tls {
     use serialize;
     use std::cell::Cell;
     use std::mem;
-    use ty::{self, Ty, TyCtxt};
-    use ty::subst::Substs;
+    use middle::ty::{self, Ty, TyCtxt};
+    use middle::subst::Substs;
     use middle::def_id::DefId;
 
     pub trait EncodingContext<'tcx> {

branches/try/src/librustc/middle/dataflow.rs

@@ -14,9 +14,9 @@
 //! and thus uses bitvectors. Your job is simply to specify the so-called
 //! GEN and KILL bits for each expression.
 
-use cfg;
-use cfg::CFGIndex;
-use ty::TyCtxt;
+use middle::cfg;
+use middle::cfg::CFGIndex;
+use middle::ty::TyCtxt;
 use std::io;
 use std::mem;
 use std::usize;

branches/try/src/librustc/middle/dead.rs

@@ -17,8 +17,8 @@ use front::map as ast_map;
 use rustc_front::hir::{self, PatKind};
 use rustc_front::intravisit::{self, Visitor};
 
-use middle::{pat_util, privacy};
-use ty::{self, TyCtxt};
+use middle::{pat_util, privacy, ty};
+use middle::ty::TyCtxt;
 use middle::def::Def;
 use middle::def_id::{DefId};
 use lint;
@@ -84,7 +84,7 @@ impl<'a, 'tcx> MarkSymbolVisitor<'a, 'tcx> {
     }
 
     fn lookup_and_handle_definition(&mut self, id: &ast::NodeId) {
-        use ty::TypeVariants::{TyEnum, TyStruct};
+        use middle::ty::TypeVariants::{TyEnum, TyStruct};
 
         // If `bar` is a trait item, make sure to mark Foo as alive in `Foo::bar`
         self.tcx.tables.borrow().item_substs.get(id)

branches/try/src/librustc/middle/def.rs

@@ -9,7 +9,7 @@
 // except according to those terms.
 
 use middle::def_id::DefId;
-use ty::subst::ParamSpace;
+use middle::subst::ParamSpace;
 use util::nodemap::NodeMap;
 use syntax::ast;
 use rustc_front::hir;

branches/try/src/librustc/middle/def_id.rs

@@ -9,7 +9,7 @@
 // except according to those terms.
 
 use middle::cstore::LOCAL_CRATE;
-use ty;
+use middle::ty;
 use syntax::ast::CrateNum;
 use std::fmt;
 use std::u32;

branches/try/src/librustc/middle/effect.rs

@@ -14,8 +14,8 @@ use self::RootUnsafeContext::*;
 
 use dep_graph::DepNode;
 use middle::def::Def;
-use ty::{self, Ty, TyCtxt};
-use ty::MethodCall;
+use middle::ty::{self, Ty, TyCtxt};
+use middle::ty::MethodCall;
 
 use syntax::ast;
 use syntax::codemap::Span;

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

@@ -22,9 +22,9 @@ use self::OverloadedCallType::*;
 use middle::pat_util;
 use middle::def::Def;
 use middle::def_id::{DefId};
-use infer;
+use middle::infer;
 use middle::mem_categorization as mc;
-use ty::{self, TyCtxt, adjustment};
+use middle::ty::{self, TyCtxt, adjustment};
 
 use rustc_front::hir::{self, PatKind};
 

branches/try/src/librustc/middle/free_region.rs

@@ -15,8 +15,8 @@
 //! `TransitiveRelation` type and use that to decide when one free
 //! region outlives another and so forth.
 
-use ty::{self, TyCtxt, FreeRegion, Region};
-use ty::wf::ImpliedBound;
+use middle::ty::{self, TyCtxt, FreeRegion, Region};
+use middle::ty::wf::ImpliedBound;
 use rustc_data_structures::transitive_relation::TransitiveRelation;
 
 #[derive(Clone)]

branches/try/src/librustc/infer/README.md renamed to branches/try/src/librustc/middle/infer/README.md

@@ -28,9 +28,9 @@
 use super::combine::{self, CombineFields};
 use super::type_variable::{BiTo};
 
-use ty::{self, Ty, TyCtxt};
-use ty::TyVar;
-use ty::relate::{Relate, RelateResult, TypeRelation};
+use middle::ty::{self, Ty, TyCtxt};
+use middle::ty::TyVar;
+use middle::ty::relate::{Relate, RelateResult, TypeRelation};
 
 pub struct Bivariate<'a, 'tcx: 'a> {
     fields: CombineFields<'a, 'tcx>

branches/try/src/librustc/infer/bivariate.rs renamed to branches/try/src/librustc/middle/infer/bivariate.rs

@@ -41,11 +41,11 @@ use super::{InferCtxt};
 use super::{MiscVariable, TypeTrace};
 use super::type_variable::{RelationDir, BiTo, EqTo, SubtypeOf, SupertypeOf};
 
-use ty::{IntType, UintType};
-use ty::{self, Ty, TyCtxt};
-use ty::error::TypeError;
-use ty::fold::{TypeFolder, TypeFoldable};
-use ty::relate::{Relate, RelateResult, TypeRelation};
+use middle::ty::{IntType, UintType};
+use middle::ty::{self, Ty, TyCtxt};
+use middle::ty::error::TypeError;
+use middle::ty::fold::{TypeFolder, TypeFoldable};
+use middle::ty::relate::{Relate, RelateResult, TypeRelation};
 
 use syntax::ast;
 use syntax::codemap::Span;

branches/try/src/librustc/infer/combine.rs renamed to branches/try/src/librustc/middle/infer/combine.rs

@@ -13,9 +13,9 @@ use super::higher_ranked::HigherRankedRelations;
 use super::{Subtype};
 use super::type_variable::{EqTo};
 
-use ty::{self, Ty, TyCtxt};
-use ty::TyVar;
-use ty::relate::{Relate, RelateResult, TypeRelation};
+use middle::ty::{self, Ty, TyCtxt};
+use middle::ty::TyVar;
+use middle::ty::relate::{Relate, RelateResult, TypeRelation};
 
 /// Ensures `a` is made equal to `b`. Returns `a` on success.
 pub struct Equate<'a, 'tcx: 'a> {

branches/try/src/librustc/infer/equate.rs renamed to branches/try/src/librustc/middle/infer/equate.rs

@@ -80,12 +80,12 @@ use rustc_front::print::pprust;
 use middle::cstore::CrateStore;
 use middle::def::Def;
 use middle::def_id::DefId;
-use infer::{self, TypeOrigin};
+use middle::infer::{self, TypeOrigin};
 use middle::region;
-use ty::subst;
-use ty::{self, Ty, TyCtxt, TypeFoldable};
-use ty::{Region, ReFree};
-use ty::error::TypeError;
+use middle::subst;
+use middle::ty::{self, Ty, TyCtxt, TypeFoldable};
+use middle::ty::{Region, ReFree};
+use middle::ty::error::TypeError;
 
 use std::cell::{Cell, RefCell};
 use std::char::from_u32;