---

yaml
---
r: 108538
b: refs/heads/dist-snap
c: eb5ba4d
h: refs/heads/master
v: v3

Author: bors

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: f64fdf524a434f0e5cd0bc91d09c144723f3c90d
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/dist-snap: 9982de6397197a63a093e7b79851d1915ef783d7
+refs/heads/dist-snap: eb5ba4d2690f29c8ced9092fe4af719e27991bbc
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/.travis.yml

@@ -0,0 +1,53 @@
+# Use something that's not 'ruby' so we don't set up things like
+# RVM/bundler/ruby and whatnot. Right now 'rust' isn't a language on travis and
+# it treats unknown languages as ruby-like I believe.
+language: c
+
+# Before we start doing anything, install the latest stock LLVM. These are
+# maintained by LLVM, and more information can be found at llvm.org/apt.
+#
+# Right now, the highest version is 3.5, and our SVN version is roughly aligned
+# with the 3.5 API (hurray!)
+install:
+  - sudo sh -c "echo 'deb http://llvm.org/apt/precise/ llvm-toolchain-precise main' >> /etc/apt/sources.list"
+  - sudo sh -c "echo 'deb-src http://llvm.org/apt/precise/ llvm-toolchain-precise main' >> /etc/apt/sources.list"
+  - sudo sh -c "echo 'deb http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu precise main' >> /etc/apt/sources.list"
+  - wget -O - http://llvm.org/apt/llvm-snapshot.gpg.key | sudo apt-key add -
+  - sudo apt-get update -qq
+  - sudo apt-get install -y --force-yes -qq llvm-3.5 llvm-3.5-dev clang-3.5 lldb-3.5
+
+# All of the llvm tools are suffixed with "-3.5" which we don't want, so symlink
+# them all into a local directory and just use that
+#
+# FIXME: this shouldn't update the src/llvm sub-repo, that takes about a minute
+#        it's gotta download so much stuff.
+before_script:
+  - mkdir -p local-llvm/bin
+  - ln -nsf /usr/bin/llvm-config-3.5 local-llvm/bin/llvm-config
+  - ln -nsf /usr/bin/llvm-mc-3.5 local-llvm/bin/llvm-mc
+  - ln -nsf /usr/bin/llvm-as-3.5 local-llvm/bin/llvm-as
+  - ln -nsf /usr/bin/llvm-dis-3.5 local-llvm/bin/llvm-dis
+  - ln -nsf /usr/bin/llc-3.5 local-llvm/bin/llc
+  - ln -nsf /usr/include/llvm-3.5 local-llvm/include
+  - ./configure --disable-optimize-tests --llvm-root=`pwd`/local-llvm --enable-fast-make --enable-clang
+
+# Tidy everything up first, then build a few things, and then run a few tests.
+# 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.
+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
+
+# We track this ourselves, and in theory we don't have to update the LLVM repo
+# (but sadly we do right now anyway).
+git:
+  submodules: false

branches/dist-snap/configure

@@ -604,7 +604,7 @@ then
     LLVM_VERSION=$($LLVM_CONFIG --version)
 
     case $LLVM_VERSION in
-        (3.[2-4]svn|3.[2-4])
+        (3.[2-5]svn|3.[2-5])
             msg "found ok version of LLVM: $LLVM_VERSION"
             ;;
         (*)
@@ -626,7 +626,7 @@ then
                       | cut -d ' ' -f 2)
 
     case $CFG_CLANG_VERSION in
-        (3.0svn | 3.0 | 3.1* | 3.2* | 3.3* | 3.4* )
+        (3.0svn | 3.0 | 3.1* | 3.2* | 3.3* | 3.4* | 3.5* )
         step_msg "found ok version of CLANG: $CFG_CLANG_VERSION"
         CFG_C_COMPILER="clang"
         ;;

branches/dist-snap/mk/main.mk

@@ -218,8 +218,12 @@ LLVM_TOOLS=bugpoint llc llvm-ar llvm-as llvm-dis llvm-mc opt llvm-extract
 define DEF_LLVM_VARS
 # The configure script defines these variables with the target triples
 # separated by Z. This defines new ones with the expected format.
+ifeq ($$(CFG_LLVM_ROOT),)
 CFG_LLVM_BUILD_DIR_$(1):=$$(CFG_LLVM_BUILD_DIR_$(subst -,_,$(1)))
 CFG_LLVM_INST_DIR_$(1):=$$(CFG_LLVM_INST_DIR_$(subst -,_,$(1)))
+else
+CFG_LLVM_INST_DIR_$(1):=$$(CFG_LLVM_ROOT)
+endif
 
 # Any rules that depend on LLVM should depend on LLVM_CONFIG
 LLVM_CONFIG_$(1):=$$(CFG_LLVM_INST_DIR_$(1))/bin/llvm-config$$(X_$(1))

branches/dist-snap/src/librustc/middle/ty.rs

@@ -3691,15 +3691,15 @@ pub fn type_err_to_str(cx: ctxt, err: &type_err) -> ~str {
             }
         }
         terr_integer_as_char => {
-            format!("expected an integral type but found char")
+            format!("expected an integral type but found `char`")
         }
         terr_int_mismatch(ref values) => {
-            format!("expected {} but found {}",
+            format!("expected `{}` but found `{}`",
                  values.expected.to_str(),
                  values.found.to_str())
         }
         terr_float_mismatch(ref values) => {
-            format!("expected {} but found {}",
+            format!("expected `{}` but found `{}`",
                  values.expected.to_str(),
                  values.found.to_str())
         }
@@ -3767,13 +3767,13 @@ pub fn provided_trait_methods(cx: ctxt, id: ast::DefId) -> ~[@Method] {
                         }
                         _ => {
                             cx.sess.bug(format!("provided_trait_methods: \
-                                                 {:?} is not a trait",
+                                                 `{:?}` is not a trait",
                                                 id))
                         }
                     }
                 }
                 _ => {
-                    cx.sess.bug(format!("provided_trait_methods: {:?} is not \
+                    cx.sess.bug(format!("provided_trait_methods: `{:?}` is not \
                                          a trait",
                                         id))
                 }

branches/dist-snap/src/librustc/middle/typeck/collect.rs

@@ -768,7 +768,7 @@ pub fn instantiate_trait_ref(ccx: &CrateCtxt,
         _ => {
             ccx.tcx.sess.span_fatal(
                 ast_trait_ref.path.span,
-                format!("{} is not a trait",
+                format!("`{}` is not a trait",
                     path_to_str(&ast_trait_ref.path)));
         }
     }

branches/dist-snap/src/librustdoc/html/static/main.js

@@ -114,8 +114,13 @@
     function initSearch(searchIndex) {
         var currentResults, index, params = getQueryStringParams();
 
-        // Populate search bar with query string search term when provided.
-        $(".search-input")[0].value = params.search || '';
+        // Populate search bar with query string search term when provided,
+        // but only if the input bar is empty. This avoid the obnoxious issue
+        // where you start trying to do a search, and the index loads, and
+        // suddenly your search is gone!
+        if ($(".search-input")[0].value === "") {
+            $(".search-input")[0].value = params.search || '';
+        }
 
         /**
          * Executes the query and builds an index of results
@@ -574,8 +579,12 @@
                     // When browsing forward to search results the previous search will be repeated,
                     // so the currentResults are cleared to ensure the search is successful.
                     currentResults = null;
-                    // Synchronize search bar with query string state and perform the search.
-                    $('.search-input').val(params.search);
+                    // Synchronize search bar with query string state and
+                    // perform the search, but don't empty the bar if there's
+                    // nothing there.
+                    if params.search !== undefined {
+                        $('.search-input').val(params.search);
+                    }
                     // Some browsers fire 'onpopstate' for every page load (Chrome), while others fire the
                     // event only when actually popping a state (Firefox), which is why search() is called
                     // both here and at the end of the startSearch() function.

branches/dist-snap/src/test/compile-fail/gated-phase.rs

@@ -9,6 +9,7 @@
 // except according to those terms.
 
 // aux-build:macro_crate_test.rs
+// ignore-stage1
 
 #[phase(syntax)]
 //~^ ERROR compile time crate loading is experimental and possibly buggy

branches/dist-snap/src/test/compile-fail/issue-2330.rs

@@ -15,7 +15,7 @@ trait channel<T> {
 }
 
 // `chan` is not a trait, it's an enum
-impl chan for int { //~ ERROR chan is not a trait
+impl chan for int { //~ ERROR `chan` is not a trait
     fn send(&self, v: int) { fail!() }
 }
 

branches/dist-snap/src/test/compile-fail/issue-3907.rs

@@ -17,7 +17,7 @@ struct S {
     name: int
 }
 
-impl Foo for S { //~ ERROR: Foo is not a trait
+impl Foo for S { //~ ERROR: `Foo` is not a trait
     fn bar() { }
 }