---

yaml
---
r: 106572
b: refs/heads/try
c: d92fdb2
h: refs/heads/master
v: v3

Author: MicahChalmer

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: b8ef9fd9c9f642ce7b8aed82782a1ed745d08d64
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: b8601a3d8b91ad3b653d143307611f2f5c75617e
-refs/heads/try: fbe26af3c5990fce56631154994b7a10f250d852
+refs/heads/try: d92fdb27cb99a9ae026cf117ab9e3bbd42523b0c
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/.travis.yml

@@ -26,11 +26,16 @@ before_script:
 # Note that this is meant to run in a "fairly small" amount of time, so this
 # isn't exhaustive at all.
 #
+# The "-lffi and -lncurses" are required for LLVM. The LLVM that rust builds
+# manually disables bringing in these two libraries, but the stock LLVM was
+# apparently built with these options. We provide these options when building so
+# the `rustc` binary can successfully link.
+#
 # As a result of https://github.com/travis-ci/travis-ci/issues/1066, we run
 # everything in one large command instead of multiple commands.
 script: |
   make tidy &&
-  make -j4 rustc-stage1 &&
+  RUSTFLAGS="-C link-args='-lffi -lncurses'" make -j4 rustc-stage1 &&
   make check-stage1-std check-stage1-rpass check-stage1-cfail check-stage1-rfail
 
 env:

branches/try/src/etc/emacs/README.md

@@ -76,8 +76,3 @@ The file `rust-mode-tests.el` contains tests that can be run via
 [ERT](http://www.gnu.org/software/emacs/manual/html_node/ert/index.html).
 You can use `run_rust_emacs_tests.sh` to run them in batch mode, if
 Emacs is somewhere in your `$PATH`.
-
-### Known bugs
-
-* Combining `global-whitespace-mode` and `rust-mode` is generally glitchy.
-  See [Issue #3994](https://github.com/mozilla/rust/issues/3994).

branches/try/src/etc/mklldeps.py

@@ -55,7 +55,6 @@
 
     f.write("#[cfg(" + ', '.join(cfg) + ")]\n")
 
-    # LLVM libs
     args = [llconfig, '--libs']
     args.extend(components)
     proc = subprocess.Popen(args, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
@@ -68,21 +67,6 @@
     for lib in out.strip().split(' '):
         lib = lib[2:] # chop of the leading '-l'
         f.write("#[link(name = \"" + lib + "\", kind = \"static\")]\n")
-
-    # LLVM ldflags
-    args = [llconfig, '--ldflags']
-    proc = subprocess.Popen(args, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-    out, err = proc.communicate()
-
-    if err:
-        print("failed to run llconfig: args = `{}`".format(args))
-        sys.exit(1)
-
-    for lib in out.strip().split(' '):
-        if lib[:2] == "-l":
-            f.write("#[link(name = \"" + lib[2:] + "\")]\n")
-
-    #extra
     f.write("#[link(name = \"stdc++\")]\n")
     if os == 'win32':
         f.write("#[link(name = \"imagehlp\")]\n")

branches/try/src/librustc/lib.rs

@@ -30,6 +30,8 @@ This API is completely unstable and subject to change.
 #[feature(macro_rules, globs, struct_variant, managed_boxes)];
 #[feature(quote)];
 
+#[allow(visible_private_types)];
+
 extern crate extra;
 extern crate flate;
 extern crate arena;

branches/try/src/librustc/metadata/decoder.rs

@@ -46,7 +46,7 @@ use syntax::ast;
 use syntax::codemap;
 use syntax::crateid::CrateId;
 
-pub type Cmd = @crate_metadata;
+type Cmd = @crate_metadata;
 
 // A function that takes a def_id relative to the crate being searched and
 // returns a def_id relative to the compilation environment, i.e. if we hit a

branches/try/src/librustc/metadata/encoder.rs

@@ -52,7 +52,7 @@ use syntax;
 use writer = serialize::ebml::writer;
 
 // used by astencode:
-pub type abbrev_map = @RefCell<HashMap<ty::t, tyencode::ty_abbrev>>;
+type abbrev_map = @RefCell<HashMap<ty::t, tyencode::ty_abbrev>>;
 
 /// A borrowed version of ast::InlinedItem.
 pub enum InlinedItemRef<'a> {
@@ -76,7 +76,7 @@ pub struct EncodeParams<'a> {
     encode_inlined_item: EncodeInlinedItem<'a>,
 }
 
-pub struct Stats {
+struct Stats {
     inline_bytes: Cell<u64>,
     attr_bytes: Cell<u64>,
     dep_bytes: Cell<u64>,

branches/try/src/librustc/metadata/tydecode.rs

@@ -54,7 +54,7 @@ pub enum DefIdSource {
     // Identifies a region parameter (`fn foo<'X>() { ... }`).
     RegionParameter,
 }
-pub type conv_did<'a> =
+type conv_did<'a> =
     'a |source: DefIdSource, ast::DefId| -> ast::DefId;
 
 pub struct PState<'a> {

branches/try/src/librustc/middle/borrowck/mod.rs

@@ -907,7 +907,7 @@ impl Repr for LoanPath {
 
 ///////////////////////////////////////////////////////////////////////////
 
-pub struct TcxTyper {
+struct TcxTyper {
     tcx: ty::ctxt,
     method_map: typeck::MethodMap,
 }

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

@@ -20,7 +20,7 @@ use syntax::{ast_util, ast_map};
 use syntax::visit::Visitor;
 use syntax::visit;
 
-pub struct CheckCrateVisitor {
+struct CheckCrateVisitor {
     sess: Session,
     def_map: resolve::DefMap,
     method_map: typeck::MethodMap,

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

@@ -126,9 +126,9 @@ use syntax::{visit, ast_util};
 use syntax::visit::{Visitor, FnKind};
 
 #[deriving(Eq)]
-pub struct Variable(uint);
+struct Variable(uint);
 #[deriving(Eq)]
-pub struct LiveNode(uint);
+struct LiveNode(uint);
 
 impl Variable {
     fn get(&self) -> uint { let Variable(v) = *self; v }
@@ -145,7 +145,7 @@ impl Clone for LiveNode {
 }
 
 #[deriving(Eq)]
-pub enum LiveNodeKind {
+enum LiveNodeKind {
     FreeVarNode(Span),
     ExprNode(Span),
     VarDefNode(Span),
@@ -226,32 +226,32 @@ impl LiveNode {
 
 fn invalid_node() -> LiveNode { LiveNode(uint::MAX) }
 
-pub struct CaptureInfo {
+struct CaptureInfo {
     ln: LiveNode,
     is_move: bool,
     var_nid: NodeId
 }
 
-pub enum LocalKind {
+enum LocalKind {
     FromMatch(BindingMode),
     FromLetWithInitializer,
     FromLetNoInitializer
 }
 
-pub struct LocalInfo {
+struct LocalInfo {
     id: NodeId,
     ident: Ident,
     is_mutbl: bool,
     kind: LocalKind,
 }
 
-pub enum VarKind {
+enum VarKind {
     Arg(NodeId, Ident),
     Local(LocalInfo),
     ImplicitRet
 }
 
-pub struct IrMaps {
+struct IrMaps {
     tcx: ty::ctxt,
     method_map: typeck::MethodMap,
     capture_map: moves::CaptureMap,
@@ -560,7 +560,7 @@ fn visit_expr(v: &mut LivenessVisitor, expr: &Expr, this: @IrMaps) {
 // the same basic propagation framework in all cases.
 
 #[deriving(Clone)]
-pub struct Users {
+struct Users {
     reader: LiveNode,
     writer: LiveNode,
     used: bool
@@ -574,7 +574,7 @@ fn invalid_users() -> Users {
     }
 }
 
-pub struct Specials {
+struct Specials {
     exit_ln: LiveNode,
     fallthrough_ln: LiveNode,
     no_ret_var: Variable
@@ -584,7 +584,7 @@ static ACC_READ: uint = 1u;
 static ACC_WRITE: uint = 2u;
 static ACC_USE: uint = 4u;
 
-pub type LiveNodeMap = @RefCell<HashMap<NodeId, LiveNode>>;
+type LiveNodeMap = @RefCell<HashMap<NodeId, LiveNode>>;
 
 pub struct Liveness {
     tcx: ty::ctxt,
@@ -1554,7 +1554,7 @@ fn check_fn(_v: &Liveness,
     // do not check contents of nested fns
 }
 
-pub enum ReadKind {
+enum ReadKind {
     PossiblyUninitializedVariable,
     PossiblyUninitializedField,
     MovedValue,

branches/try/src/librustc/middle/trans/base.rs

@@ -1322,8 +1322,8 @@ fn arg_kind(cx: &FunctionContext, t: ty::t) -> datum::Rvalue {
 }
 
 // work around bizarre resolve errors
-pub type RvalueDatum = datum::Datum<datum::Rvalue>;
-pub type LvalueDatum = datum::Datum<datum::Lvalue>;
+type RvalueDatum = datum::Datum<datum::Rvalue>;
+type LvalueDatum = datum::Datum<datum::Lvalue>;
 
 // create_datums_for_fn_args: creates rvalue datums for each of the
 // incoming function arguments. These will later be stored into

branches/try/src/librustc/middle/trans/cleanup.rs

@@ -51,20 +51,20 @@ pub static EXIT_BREAK: uint = 0;
 pub static EXIT_LOOP: uint = 1;
 pub static EXIT_MAX: uint = 2;
 
-pub enum CleanupScopeKind<'a> {
+enum CleanupScopeKind<'a> {
     CustomScopeKind,
     AstScopeKind(ast::NodeId),
     LoopScopeKind(ast::NodeId, [&'a Block<'a>, ..EXIT_MAX])
 }
 
 #[deriving(Eq)]
-pub enum EarlyExitLabel {
+enum EarlyExitLabel {
     UnwindExit,
     ReturnExit,
     LoopExit(ast::NodeId, uint)
 }
 
-pub struct CachedEarlyExit {
+struct CachedEarlyExit {
     label: EarlyExitLabel,
     cleanup_block: BasicBlockRef,
 }

branches/try/src/librustc/middle/trans/common.rs

@@ -212,8 +212,8 @@ impl Repr for param_substs {
 }
 
 // work around bizarre resolve errors
-pub type RvalueDatum = datum::Datum<datum::Rvalue>;
-pub type LvalueDatum = datum::Datum<datum::Lvalue>;
+type RvalueDatum = datum::Datum<datum::Rvalue>;
+type LvalueDatum = datum::Datum<datum::Lvalue>;
 
 // Function context.  Every LLVM function we create will have one of
 // these.

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

@@ -158,9 +158,9 @@ pub struct creader_cache_key {
     len: uint
 }
 
-pub type creader_cache = RefCell<HashMap<creader_cache_key, t>>;
+type creader_cache = RefCell<HashMap<creader_cache_key, t>>;
 
-pub struct intern_key {
+struct intern_key {
     sty: *sty,
 }
 
@@ -1068,7 +1068,7 @@ pub struct ty_param_substs_and_ty {
     ty: ty::t
 }
 
-pub type type_cache = RefCell<HashMap<ast::DefId, ty_param_bounds_and_ty>>;
+type type_cache = RefCell<HashMap<ast::DefId, ty_param_bounds_and_ty>>;
 
 pub type node_type_table = RefCell<HashMap<uint,t>>;
 

branches/try/src/librustc/middle/typeck/check/_match.rs

@@ -729,4 +729,4 @@ pub fn check_pointer_pat(pcx: &pat_ctxt,
 }
 
 #[deriving(Eq)]
-pub enum PointerKind { Send, Borrowed }
+enum PointerKind { Send, Borrowed }

branches/try/src/librustc/middle/typeck/check/method.rs

@@ -236,7 +236,7 @@ pub struct Candidate {
 /// now we must check that the type `T` is correct).  Unfortunately,
 /// because traits are not types, this is a pain to do.
 #[deriving(Clone)]
-pub enum RcvrMatchCondition {
+enum RcvrMatchCondition {
     RcvrMatchesIfObject(ast::DefId),
     RcvrMatchesIfSubtype(ty::t)
 }

branches/try/src/librustc/middle/typeck/infer/mod.rs

@@ -500,7 +500,7 @@ fn rollback_to<V:Clone + Vid,T:Clone>(vb: &mut ValsAndBindings<V, T>,
     }
 }
 
-pub struct Snapshot {
+struct Snapshot {
     ty_var_bindings_len: uint,
     int_var_bindings_len: uint,
     float_var_bindings_len: uint,

branches/try/src/librustc/middle/typeck/infer/region_inference/mod.rs

@@ -35,27 +35,27 @@ use syntax::opt_vec::OptVec;
 mod doc;
 
 #[deriving(Eq, Hash)]
-pub enum Constraint {
+enum Constraint {
     ConstrainVarSubVar(RegionVid, RegionVid),
     ConstrainRegSubVar(Region, RegionVid),
     ConstrainVarSubReg(RegionVid, Region),
     ConstrainRegSubReg(Region, Region),
 }
 
 #[deriving(Eq, Hash)]
-pub struct TwoRegions {
+struct TwoRegions {
     a: Region,
     b: Region,
 }
 
-pub enum UndoLogEntry {
+enum UndoLogEntry {
     Snapshot,
     AddVar(RegionVid),
     AddConstraint(Constraint),
     AddCombination(CombineMapType, TwoRegions)
 }
 
-pub enum CombineMapType {
+enum CombineMapType {
     Lub, Glb
 }
 
@@ -84,7 +84,7 @@ pub enum RegionResolutionError {
                    SubregionOrigin, Region),
 }
 
-pub type CombineMap = HashMap<TwoRegions, RegionVid>;
+type CombineMap = HashMap<TwoRegions, RegionVid>;
 
 pub struct RegionVarBindings {
     tcx: ty::ctxt,
@@ -764,7 +764,7 @@ impl RegionVarBindings {
 #[deriving(Eq, Show)]
 enum Classification { Expanding, Contracting }
 
-pub enum VarValue { NoValue, Value(Region), ErrorValue }
+enum VarValue { NoValue, Value(Region), ErrorValue }
 
 struct VarData {
     classification: Classification,