---

yaml
---
r: 104552
b: refs/heads/try
c: 82747ed
h: refs/heads/master
v: v3

Author: Jag Talon

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 62f1d68439dcfd509eaca29887afa97f22938373
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 6e7f170fedd3c526a643c0b2d13863acd982be02
-refs/heads/try: eb86913dcf72dcb628d9b5250aabd2da0ca7df49
+refs/heads/try: 82747ed93e5af967b691653a56849da2c209d85d
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/.travis.yml

@@ -39,13 +39,10 @@ before_script:
 # 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 &&
-  RUSTFLAGS="-C link-args='-lffi -lncurses'" make -j4 rustc-stage1 &&
-  make check-stage1-std check-stage1-rpass check-stage1-cfail check-stage1-rfail
+script:
+  - make tidy
+  - RUSTFLAGS="-C link-args='-lffi -lncurses'" make -j4 rustc-stage1
+  - make check-stage1-std check-stage1-rpass check-stage1-cfail check-stage1-rfail
 
 env:
   - NO_BENCH=1

branches/try/configure

@@ -803,6 +803,7 @@ do
     make_dir $h/test/doc-guide-pointers
     make_dir $h/test/doc-guide-container
     make_dir $h/test/doc-guide-tasks
+    make_dir $h/test/doc-guide-conditions
     make_dir $h/test/doc-complement-cheatsheet
     make_dir $h/test/doc-rust
 done

branches/try/mk/main.mk

@@ -345,10 +345,10 @@ endif
 ifdef CFG_DISABLE_RPATH
 ifeq ($$(OSTYPE_$(3)),apple-darwin)
   RPATH_VAR$(1)_T_$(2)_H_$(3) := \
-      DYLD_LIBRARY_PATH="$$$$DYLD_LIBRARY_PATH:$$(CURDIR)/$$(HLIB$(1)_H_$(3))"
+      DYLD_LIBRARY_PATH="$$$$DYLD_LIBRARY_PATH:$$(HLIB$(1)_H_$(3))"
 else
   RPATH_VAR$(1)_T_$(2)_H_$(3) := \
-      LD_LIBRARY_PATH="$$$$LD_LIBRARY_PATH:$$(CURDIR)/$$(HLIB$(1)_H_$(3))"
+      LD_LIBRARY_PATH="$$$$LD_LIBRARY_PATH:$$(HLIB$(1)_H_$(3))"
 endif
 else
     RPATH_VAR$(1)_T_$(2)_H_$(3) :=

branches/try/mk/tests.mk

@@ -708,9 +708,8 @@ check-stage$(1)-T-$(2)-H-$(3)-doc-$(4)-exec: $$(call TEST_OK_FILE,$(1),$(2),$(3)
 ifeq ($(2),$$(CFG_BUILD))
 $$(call TEST_OK_FILE,$(1),$(2),$(3),doc-$(4)): $$(DOCTESTDEP_$(1)_$(2)_$(3)_$(4))
 	@$$(call E, run doc-$(4) [$(2)])
-	$$(Q)$$(RPATH_VAR$(1)_T_$(2)_H_$(3)) \
-		$$(HBIN$(1)_H_$(3))/rustdoc$$(X_$(3)) --test \
-	    	$$(CRATEFILE_$(4)) --test-args "$$(TESTARGS)" && touch $$@
+	$$(Q)$$(HBIN$(1)_H_$(3))/rustdoc$$(X_$(3)) --test \
+	    $$(CRATEFILE_$(4)) --test-args "$$(TESTARGS)" && touch $$@
 else
 $$(call TEST_OK_FILE,$(1),$(2),$(3),doc-$(4)):
 	touch $$@
@@ -937,8 +936,7 @@ $(3)/test/run-make/%-$(1)-T-$(2)-H-$(3).ok: \
 	    $(3)/test/run-make/$$* \
 	    "$$(CC_$(3)) $$(CFG_GCCISH_CFLAGS_$(3))" \
 	    $$(HBIN$(1)_H_$(3))/rustdoc$$(X_$(3)) \
-	    "$$(TESTNAME)" \
-	    "$$(RPATH_VAR$(1)_T_$(2)_H_$(3))"
+	    "$$(TESTNAME)"
 	@touch $$@
 else
 # FIXME #11094 - The above rule doesn't work right for multiple targets

branches/try/src/README.md

@@ -10,21 +10,6 @@ Source layout:
 | `libgreen/`         | The M:N runtime library                                   |
 | `libnative/`        | The 1:1 runtime library                                   |
 | `libsyntax/`        | The Rust parser and pretty-printer                        |
-| `libcollections/`   | A collection of useful data structures and containers     |
-| `libnum/`           | Extended number support library (complex, rational, etc)  |
-| `libtest/`          | Rust's test-runner code                                   |
-| ------------------- | --------------------------------------------------------- |
-| `libarena/`         | The arena (a fast but limited) memory allocator           |
-| `libflate/`         | Simple compression library                                |
-| `libfourcc/`        | Data format identifier library                            |
-| `libgetopts/`       | Get command-line-options library                          |
-| `libglob/`          | Unix glob patterns library                                |
-| `libsemver/`        | Rust's semantic versioning library                        |
-| `libserialize/`     | Encode-Decode types library                               |
-| `libsync/`          | Concurrency mechanisms and primitives                     |
-| `libterm/`          | ANSI color library for terminals                          |
-| `libtime/`          | Time operations library                                   |
-| `libuuid/`          | UUID's handling code                                      |
 | ------------------- | --------------------------------------------------------- |
 | `rt/`               | The runtime system                                        |
 | `rt/rust_*.c`       | - Some of the runtime services                            |
@@ -46,13 +31,8 @@ Source layout:
 | ------------------- | --------------------------------------------------------- |
 | `librustdoc/`       | The Rust API documentation tool                           |
 | `libuv/`            | The libuv submodule                                       |
-| `librustuv/`        | Rust libuv support code                                   |
 | ------------------- | --------------------------------------------------------- |
 | `llvm/`             | The LLVM submodule                                        |
 | `rustllvm/`         | LLVM support code                                         |
 | ------------------- | --------------------------------------------------------- |
 | `etc/`              | Scripts, editors support, misc                            |
-
-
-NOTE: This list (especially the second part of the table which contains modules and libraries)
-is highly volatile and subject to change.

branches/try/src/compiletest/procsrv.rs

@@ -35,26 +35,8 @@ fn target_env(lib_path: &str, prog: &str) -> ~[(~str,~str)] {
 #[cfg(target_os = "linux")]
 #[cfg(target_os = "macos")]
 #[cfg(target_os = "freebsd")]
-fn target_env(lib_path: &str, prog: &str) -> ~[(~str,~str)] {
-    // Make sure we include the aux directory in the path
-    let aux_path = prog + ".libaux";
-
-    let mut env = os::env();
-    let var = if cfg!(target_os = "macos") {
-        "DYLD_LIBRARY_PATH"
-    } else {
-        "LD_LIBRARY_PATH"
-    };
-    let prev = match env.iter().position(|&(ref k, _)| k.as_slice() == var) {
-        Some(i) => env.remove(i).unwrap().val1(),
-        None => ~"",
-    };
-    env.push((var.to_owned(), if prev.is_empty() {
-        lib_path + ":" + aux_path
-    } else {
-        lib_path + ":" + aux_path + ":" + prev
-    }));
-    return env;
+fn target_env(_lib_path: &str, _prog: &str) -> ~[(~str,~str)] {
+    os::env()
 }
 
 pub struct Result {status: ProcessExit, out: ~str, err: ~str}

branches/try/src/doc/index.md

@@ -19,6 +19,7 @@ li {list-style-type: none; }
 * [Foreign Function Interface](guide-ffi.html)
 * [Macros](guide-macros.html)
 * [Testing](guide-testing.html)
+* [Conditions](guide-conditions.html)
 * [Rust's Runtime](guide-runtime.html)
 
 # Libraries
@@ -42,7 +43,6 @@ li {list-style-type: none; }
 * [The `sync` library for concurrency-enabled mechanisms and primitives](sync/index.html)
 * [The `syntax` library, the Rust parser](syntax/index.html)
 * [The `term` terminal-handling library](term/index.html)
-* [The `test` library](test/index.html)
 * [The `uuid` 128-bit universally unique identifier library](uuid/index.html)
 
 # Tooling

branches/try/src/doc/tutorial.md

@@ -1420,8 +1420,8 @@ bad, but often copies are expensive. So we’d like to define a function
 that takes the points by pointer. We can use references to do this:
 
 ~~~
-use std::num::sqrt;
 # struct Point { x: f64, y: f64 }
+# fn sqrt(f: f64) -> f64 { 0.0 }
 fn compute_distance(p1: &Point, p2: &Point) -> f64 {
     let x_d = p1.x - p2.x;
     let y_d = p1.y - p2.y;
@@ -1468,14 +1468,14 @@ For a more in-depth explanation of references and lifetimes, read the
 
 ## Freezing
 
-Lending an immutable pointer to an object freezes it and prevents mutation.
+Lending an &-pointer to an object freezes it and prevents mutation—even if the object was declared as `mut`.
 `Freeze` objects have freezing enforced statically at compile-time. An example
 of a non-`Freeze` type is [`RefCell<T>`][refcell].
 
 ~~~~
 let mut x = 5;
 {
-    let y = &x; // `x` is now frozen, it cannot be modified
+    let y = &x; // `x` is now frozen. It cannot be modified or re-assigned.
 }
 // `x` is now unfrozen again
 # x = 3;
@@ -2021,8 +2021,8 @@ C++ templates.
 
 ## Traits
 
-Within a generic function -- that is, a function parameterized by a
-type parameter, say, `T` -- the operations we can do on arguments of
+Within a generic function—that is, a function parameterized by a
+type parameter, say, `T`—the operations we can do on arguments of
 type `T` are quite limited.  After all, since we don't know what type
 `T` will be instantiated with, we can't safely modify or query values
 of type `T`.  This is where _traits_ come into play. Traits are Rust's

branches/try/src/etc/maketest.py

@@ -17,9 +17,6 @@
 os.putenv('CC', sys.argv[4])
 os.putenv('RUSTDOC', os.path.abspath(sys.argv[5]))
 filt = sys.argv[6]
-ldpath = sys.argv[7]
-if ldpath != '':
-    os.putenv(ldpath.split('=')[0], ldpath.split('=')[1])
 
 if not filt in sys.argv[1]:
     sys.exit(0)

branches/try/src/libcollections/hashmap.rs

@@ -53,7 +53,6 @@
 //! ```
 
 use std::cmp::max;
-use std::default::Default;
 use std::fmt;
 use std::hash::{Hash, Hasher, sip};
 use std::iter::{FilterMap, Chain, Repeat, Zip};
@@ -98,7 +97,7 @@ fn resize_at(capacity: uint) -> uint {
     (capacity * 3) / 4
 }
 
-impl<K:Hash + Eq, V> HashMap<K, V> {
+impl<K:Hash + Eq,V> HashMap<K, V> {
     #[inline]
     fn to_bucket(&self, h: uint) -> uint {
         // A good hash function with entropy spread over all of the

branches/try/src/libextra/url.rs

@@ -16,7 +16,6 @@ use std::cmp::Eq;
 use std::fmt;
 use std::hash::{Hash, sip};
 use std::io::BufReader;
-use std::from_str::FromStr;
 use std::uint;
 
 use collections::HashMap;

branches/try/src/libgreen/sched.rs

@@ -1394,6 +1394,8 @@ mod test {
         });
     }
 
+    // FIXME: #9407: ignore-test
+    #[ignore]
     #[test]
     fn dont_starve_1() {
         let mut pool = SchedPool::new(PoolConfig {

branches/try/src/libgreen/stack.rs

@@ -139,7 +139,7 @@ impl StackPool {
     pub fn take_stack(&mut self, min_size: uint) -> Stack {
         // Ideally this would be a binary search
         match self.stacks.iter().position(|s| min_size <= s.min_size) {
-            Some(idx) => self.stacks.swap_remove(idx).unwrap(),
+            Some(idx) => self.stacks.swap_remove(idx),
             None => Stack::new(min_size)
         }
     }

branches/try/src/libnum/bigint.rs

@@ -20,7 +20,6 @@ use Integer;
 
 use std::cmp;
 use std::fmt;
-use std::from_str::FromStr;
 use std::num::{Bitwise, ToPrimitive, FromPrimitive};
 use std::num::{Zero, One, ToStrRadix, FromStrRadix};
 use std::rand::Rng;
@@ -1398,9 +1397,8 @@ mod biguint_tests {
     use super::{Plus, BigInt, RandBigInt, ToBigInt};
 
     use std::cmp::{Less, Equal, Greater};
-    use std::from_str::FromStr;
     use std::i64;
-    use std::num::{Zero, One, FromStrRadix, ToStrRadix};
+    use std::num::{Zero, One, FromStrRadix};
     use std::num::{ToPrimitive, FromPrimitive};
     use std::rand::{task_rng};
     use std::str;
@@ -2058,7 +2056,7 @@ mod bigint_tests {
 
     use std::cmp::{Less, Equal, Greater};
     use std::i64;
-    use std::num::{Zero, One, FromStrRadix, ToStrRadix};
+    use std::num::{Zero, One, FromStrRadix};
     use std::num::{ToPrimitive, FromPrimitive};
     use std::rand::{task_rng};
     use std::u64;

branches/try/src/libnum/rational.rs

@@ -333,7 +333,7 @@ impl<T: FromStrRadix + Clone + Integer + Ord>
 mod test {
 
     use super::{Ratio, Rational, BigRational};
-    use std::num::{Zero, One, FromStrRadix, FromPrimitive, ToStrRadix};
+    use std::num::{Zero,One,FromStrRadix,FromPrimitive};
     use std::from_str::FromStr;
 
     pub static _0 : Rational = Ratio { numer: 0, denom: 1};

branches/try/src/librustc/back/archive.rs

@@ -145,10 +145,7 @@ impl Archive {
     /// Lists all files in an archive
     pub fn files(&self) -> ~[~str] {
         let output = run_ar(self.sess, "t", None, [&self.dst]);
-        let output = str::from_utf8(output.output).unwrap();
-        // use lines_any because windows delimits output with `\r\n` instead of
-        // just `\n`
-        output.lines_any().map(|s| s.to_owned()).collect()
+        str::from_utf8(output.output).unwrap().lines().map(|s| s.to_owned()).collect()
     }
 
     fn add_archive(&mut self, archive: &Path, name: &str,

branches/try/src/librustc/driver/driver.rs

@@ -295,8 +295,8 @@ pub fn phase_3_run_analysis_passes(sess: Session,
     let region_map = time(time_passes, "region resolution", (), |_|
                           middle::region::resolve_crate(sess, krate));
 
-    let ty_cx = ty::mk_ctxt(sess, def_map, named_region_map, ast_map,
-                            freevars, region_map, lang_items);
+    let ty_cx = ty::mk_ctxt(sess, def_map, named_region_map, ast_map, freevars,
+                            region_map, lang_items);
 
     // passes are timed inside typeck
     let (method_map, vtable_map) = typeck::check_crate(ty_cx, trait_map, krate);
@@ -975,7 +975,6 @@ pub fn build_session_(sopts: @session::Options,
         lints: RefCell::new(HashMap::new()),
         node_id: Cell::new(1),
         crate_types: @RefCell::new(~[]),
-        features: front::feature_gate::Features::new()
     }
 }
 

branches/try/src/librustc/driver/session.rs

@@ -12,7 +12,6 @@
 use back::target_strs;
 use back;
 use driver::driver::host_triple;
-use front;
 use metadata::filesearch;
 use metadata;
 use middle::lint;
@@ -187,7 +186,6 @@ pub struct Session_ {
                            ~[(lint::Lint, codemap::Span, ~str)]>>,
     node_id: Cell<ast::NodeId>,
     crate_types: @RefCell<~[CrateType]>,
-    features: front::feature_gate::Features
 }
 
 pub type Session = @Session_;

branches/try/src/librustc/front/feature_gate.rs

@@ -30,8 +30,6 @@ use syntax::parse::token;
 
 use driver::session::Session;
 
-use std::cell::Cell;
-
 /// This is a list of all known features since the beginning of time. This list
 /// can never shrink, it may only be expanded (in order to prevent old programs
 /// from failing to compile). The status of each feature may change, however.
@@ -71,19 +69,6 @@ enum Status {
     Accepted,
 }
 
-/// A set of features to be used by later passes.
-pub struct Features {
-    default_type_params: Cell<bool>
-}
-
-impl Features {
-    pub fn new() -> Features {
-        Features {
-            default_type_params: Cell::new(false)
-        }
-    }
-}
-
 struct Context {
     features: ~[&'static str],
     sess: Session,
@@ -330,6 +315,4 @@ pub fn check_crate(sess: Session, krate: &ast::Crate) {
     visit::walk_crate(&mut cx, krate, ());
 
     sess.abort_if_errors();
-
-    sess.features.default_type_params.set(cx.has_feature("default_type_params"));
 }

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

@@ -67,18 +67,6 @@ pub struct ArchiveMetadata {
     priv data: &'static [u8],
 }
 
-// FIXME(#11857) this should be a "real" realpath
-fn realpath(p: &Path) -> Path {
-    use std::os;
-    use std::io::fs;
-
-    let path = os::make_absolute(p);
-    match fs::readlink(&path) {
-        Ok(p) => p,
-        Err(..) => path
-    }
-}
-
 impl Context {
     pub fn load_library_crate(&self, root_ident: Option<~str>) -> Library {
         match self.find_library_crate() {
@@ -133,7 +121,7 @@ impl Context {
                             (HashSet::new(), HashSet::new())
                         });
                         let (ref mut rlibs, _) = *slot;
-                        rlibs.insert(realpath(path));
+                        rlibs.insert(path.clone());
                         FileMatches
                     }
                     None => {
@@ -150,7 +138,7 @@ impl Context {
                             (HashSet::new(), HashSet::new())
                         });
                         let (_, ref mut dylibs) = *slot;
-                        dylibs.insert(realpath(path));
+                        dylibs.insert(path.clone());
                         FileMatches
                     }
                     None => {