---

yaml
---
r: 276551
b: refs/heads/try
c: ed28247
h: refs/heads/master
i:
  276549: 8976fee
  276547: ee76a0c
  276543: c656d3e

Author: cardoe

[refs]

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

branches/try/configure

@@ -969,11 +969,11 @@ then
     LLVM_VERSION=$($LLVM_CONFIG --version)
 
     case $LLVM_VERSION in
-        (3.[5-8]*)
+        (3.[6-8]*)
             msg "found ok version of LLVM: $LLVM_VERSION"
             ;;
         (*)
-            err "bad LLVM version: $LLVM_VERSION, need >=3.5"
+            err "bad LLVM version: $LLVM_VERSION, need >=3.6"
             ;;
     esac
 fi

branches/try/mk/tests.mk

@@ -383,7 +383,7 @@ $(3)/stage$(1)/test/$(4)test-$(2)$$(X_$(2)): \
 	@$$(call E, rustc: $$@)
 	$(Q)CFG_LLVM_LINKAGE_FILE=$$(LLVM_LINKAGE_PATH_$(2)) \
 	    $$(subst @,,$$(STAGE$(1)_T_$(2)_H_$(3))) -o $$@ $$< --test \
-		-Cmetadata="test-crate" -L "$$(RT_OUTPUT_DIR_$(2))" \
+		-L "$$(RT_OUTPUT_DIR_$(2))" \
 		$$(LLVM_LIBDIR_RUSTFLAGS_$(2)) \
 		$$(RUSTFLAGS_$(4))
 

branches/try/src/compiletest/common.rs

@@ -69,10 +69,10 @@ impl fmt::Display for Mode {
 #[derive(Clone)]
 pub struct Config {
     // The library paths required for running the compiler
-    pub compile_lib_path: PathBuf,
+    pub compile_lib_path: String,
 
     // The library paths required for running compiled programs
-    pub run_lib_path: PathBuf,
+    pub run_lib_path: String,
 
     // The rustc executable
     pub rustc_path: PathBuf,

branches/try/src/compiletest/compiletest.rs

@@ -118,17 +118,9 @@ pub fn parse_config(args: Vec<String> ) -> Config {
         }
     }
 
-    fn make_absolute(path: PathBuf) -> PathBuf {
-        if path.is_relative() {
-            env::current_dir().unwrap().join(path)
-        } else {
-            path
-        }
-    }
-
     Config {
-        compile_lib_path: make_absolute(opt_path(matches, "compile-lib-path")),
-        run_lib_path: make_absolute(opt_path(matches, "run-lib-path")),
+        compile_lib_path: matches.opt_str("compile-lib-path").unwrap(),
+        run_lib_path: matches.opt_str("run-lib-path").unwrap(),
         rustc_path: opt_path(matches, "rustc-path"),
         rustdoc_path: opt_path(matches, "rustdoc-path"),
         python: matches.opt_str("python").unwrap(),

branches/try/src/compiletest/runtest.rs

@@ -316,7 +316,7 @@ fn run_pretty_test_revision(config: &Config,
                                      testpaths,
                                      pretty_type.to_owned()),
                         props.exec_env.clone(),
-                        config.compile_lib_path.to_str().unwrap(),
+                        &config.compile_lib_path,
                         Some(aux_dir.to_str().unwrap()),
                         Some(src))
     }
@@ -635,7 +635,7 @@ fn run_debuginfo_gdb_test(config: &Config, props: &TestProps, testpaths: &TestPa
                                                   testpaths,
                                                   proc_args,
                                                   environment,
-                                                  config.run_lib_path.to_str().unwrap(),
+                                                  &config.run_lib_path,
                                                   None,
                                                   None);
         }
@@ -1315,7 +1315,7 @@ fn exec_compiled_test(config: &Config, props: &TestProps,
                             testpaths,
                             make_run_args(config, props, testpaths),
                             env,
-                            config.run_lib_path.to_str().unwrap(),
+                            &config.run_lib_path,
                             Some(aux_dir.to_str().unwrap()),
                             None)
         }
@@ -1387,7 +1387,7 @@ fn compose_and_run_compiler(config: &Config, props: &TestProps,
                                      &aux_testpaths,
                                      aux_args,
                                      Vec::new(),
-                                     config.compile_lib_path.to_str().unwrap(),
+                                     &config.compile_lib_path,
                                      Some(aux_dir.to_str().unwrap()),
                                      None);
         if !auxres.status.success() {
@@ -1410,7 +1410,7 @@ fn compose_and_run_compiler(config: &Config, props: &TestProps,
                     testpaths,
                     args,
                     props.rustc_env.clone(),
-                    config.compile_lib_path.to_str().unwrap(),
+                    &config.compile_lib_path,
                     Some(aux_dir.to_str().unwrap()),
                     input)
 }

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

@@ -55,7 +55,7 @@ BOOM times 100!!!
 BOOM times 1!!!
 ```
 
-The `tnt` goes off before the `firecracker` does, because it was declared
+The TNT goes off before the firecracker does, because it was declared
 afterwards. Last in, first out.
 
 So what is `Drop` good for? Generally, `Drop` is used to clean up any resources

branches/try/src/libcore/clone.rs

@@ -18,29 +18,6 @@
 //! them cheap and safe to copy. For other types copies must be made
 //! explicitly, by convention implementing the `Clone` trait and calling
 //! the `clone` method.
-//!
-//! Basic usage example:
-//!
-//! ```
-//! let s = String::new(); // String type implements Clone
-//! let copy = s.clone(); // so we can clone it
-//! ```
-//!
-//! To easily implement the Clone trait, you can also use
-//! `#[derive(Clone)]`. Example:
-//!
-//! ```
-//! #[derive(Clone)] // we add the Clone trait to Morpheus struct
-//! struct Morpheus {
-//!    blue_pill: f32,
-//!    red_pill: i64,
-//! }
-//!
-//! fn main() {
-//!    let f = Morpheus { blue_pill: 0.0, red_pill: 0 };
-//!    let copy = f.clone(); // and now we can clone it!
-//! }
-//! ```
 
 #![stable(feature = "rust1", since = "1.0.0")]