---

yaml
---
r: 196542
b: refs/heads/auto
c: 85f6c9f
h: refs/heads/master
v: v3

Author: mdinger

[refs]

@@ -10,7 +10,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: b3c5507f3a1a5e6caf07ffa63b125725c0b30f3d
+refs/heads/auto: 85f6c9ff84816c5286e2eae208fa150a0ba64ce4
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/src/compiletest/runtest.rs

@@ -382,8 +382,7 @@ fn run_debuginfo_gdb_test(config: &Config, props: &TestProps, testfile: &Path) {
 
             // write debugger script
             let mut script_str = String::with_capacity(2048);
-            let charset = if cfg!(target_os = "bitrig") { "auto" } else { "UTF-8" };
-            script_str.push_str(&format!("set charset {}\n", charset));
+            script_str.push_str("set charset UTF-8\n");
             script_str.push_str(&format!("file {}\n", exe_file.to_str().unwrap()));
             script_str.push_str("target remote :5039\n");
             script_str.push_str(&format!("set solib-search-path \
@@ -517,8 +516,8 @@ fn run_debuginfo_gdb_test(config: &Config, props: &TestProps, testfile: &Path) {
                                                        .to_string();
             // write debugger script
             let mut script_str = String::with_capacity(2048);
-            let charset = if cfg!(target_os = "bitrig") { "auto" } else { "UTF-8" };
-            script_str.push_str(&format!("set charset {}\n", charset));
+
+            script_str.push_str("set charset UTF-8\n");
             script_str.push_str("show version\n");
 
             match config.gdb_version {

branches/auto/src/doc/trpl/closures.md

@@ -54,7 +54,7 @@ The second is that the syntax is similar, but a bit different. I've added spaces
 here to make them look a little closer:
 
 ```rust
-fn  plus_one_v1 (  x: i32 ) -> i32 { x + 1 }
+fn  plus_one_v1   (x: i32 ) -> i32 { x + 1 }
 let plus_one_v2 = |x: i32 | -> i32 { x + 1 };
 let plus_one_v3 = |x: i32 |          x + 1  ;
 ```

branches/auto/src/libcore/convert.rs

@@ -21,15 +21,15 @@ use marker::Sized;
 /// A cheap, reference-to-reference conversion.
 #[stable(feature = "rust1", since = "1.0.0")]
 pub trait AsRef<T: ?Sized> {
-    /// Performs the conversion.
+    /// Perform the conversion.
     #[stable(feature = "rust1", since = "1.0.0")]
     fn as_ref(&self) -> &T;
 }
 
 /// A cheap, mutable reference-to-mutable reference conversion.
 #[stable(feature = "rust1", since = "1.0.0")]
 pub trait AsMut<T: ?Sized> {
-    /// Performs the conversion.
+    /// Perform the conversion.
     #[stable(feature = "rust1", since = "1.0.0")]
     fn as_mut(&mut self) -> &mut T;
 }
@@ -38,15 +38,15 @@ pub trait AsMut<T: ?Sized> {
 /// expensive.
 #[stable(feature = "rust1", since = "1.0.0")]
 pub trait Into<T>: Sized {
-    /// Performs the conversion.
+    /// Perform the conversion.
     #[stable(feature = "rust1", since = "1.0.0")]
     fn into(self) -> T;
 }
 
 /// Construct `Self` via a conversion.
 #[stable(feature = "rust1", since = "1.0.0")]
 pub trait From<T> {
-    /// Performs the conversion.
+    /// Perform the conversion.
     #[stable(feature = "rust1", since = "1.0.0")]
     fn from(T) -> Self;
 }

branches/auto/src/librustdoc/html/static/main.js

@@ -468,8 +468,6 @@
                     if ($active.length) {
                         document.location.href = $active.find('a').prop('href');
                     }
-                } else {
-                  $active.removeClass('highlighted');
                 }
             });
         }

branches/auto/src/libstd/sys/unix/fs.rs

@@ -381,8 +381,7 @@ mod tests {
     use prelude::v1::*;
 
     #[cfg_attr(any(target_os = "freebsd",
-                   target_os = "openbsd",
-                   target_os = "bitrig"),
+                   target_os = "openbsd"),
                ignore)]
     // under some system, pipe(2) will return a bidrectionnal pipe
     #[test]

branches/auto/src/test/debuginfo/gdb-pretty-struct-and-enums-pre-gdb-7-7.rs

@@ -12,7 +12,6 @@
 // older versions of GDB too. A more extensive test can be found in
 // gdb-pretty-struct-and-enums.rs
 
-// ignore-bitrig
 // ignore-windows failing on win32 bot
 // ignore-freebsd: gdb package too new
 // ignore-tidy-linelength

branches/auto/src/test/parse-fail/issue-5806.rs

@@ -11,7 +11,6 @@
 // ignore-windows
 // ignore-freebsd
 // ignore-openbsd
-// ignore-bitrig
 
 #[path = "../compile-fail"]
 mod foo; //~ ERROR: a directory

branches/auto/src/test/run-make/c-link-to-rust-staticlib/Makefile

@@ -8,7 +8,7 @@ endif
 ifneq ($(shell uname),FreeBSD)
 all:
 	$(RUSTC) foo.rs
-	$(CC) bar.c -lfoo -o $(call RUN_BINFILE,bar) $(EXTRAFLAGS) $(EXTRACXXFLAGS)
+	$(CC) bar.c -lfoo -o $(call RUN_BINFILE,bar) $(EXTRAFLAGS) -lstdc++
 	$(call RUN,bar)
 	rm $(call STATICLIB,foo*)
 	$(call RUN,bar)

branches/auto/src/test/run-make/issue-14500/Makefile

@@ -6,10 +6,6 @@
 # is compiled with LTO, it shouldn't strip the symbol from `foo`, and that's the
 # only way that `foo.c` will successfully compile.
 
-ifeq ($(UNAME),Bitrig)
-	EXTRACFLAGS := -lc $(EXTRACFLAGS) $(EXTRACXXFLAGS)
-endif
-
 all:
 	$(RUSTC) foo.rs --crate-type=rlib
 	$(RUSTC) bar.rs --crate-type=staticlib -C lto -L. -o $(TMPDIR)/libbar.a

branches/auto/src/test/run-make/lto-smoke-c/Makefile

@@ -5,5 +5,5 @@ CC := $(CC:-g=)
 
 all:
 	$(RUSTC) foo.rs -C lto
-	$(CC) bar.c -lfoo -o $(call RUN_BINFILE,bar) $(EXTRACFLAGS) $(EXTRACXXFLAGS)
+	$(CC) bar.c -lfoo -o $(call RUN_BINFILE,bar) $(EXTRACFLAGS) -lstdc++
 	$(call RUN,bar)

branches/auto/src/test/run-make/no-stack-check/Makefile

@@ -1,11 +1,7 @@
 -include ../tools.mk
 
-
 ifndef IS_WINDOWS
-
-SKIP_OS := 'OpenBSD Bitrig'
-ifneq ($(UNAME),$(findstring $(UNAME),$(SKIP_OS)))
-
+ifneq ($(UNAME),OpenBSD)
 all:
 	$(RUSTC) -O --emit asm attr.rs
 	! grep -q morestack $(TMPDIR)/attr.s
@@ -14,10 +10,9 @@ all:
 	$(RUSTC) -O --emit asm -C no-stack-check flag.rs
 	! grep -q morestack $(TMPDIR)/flag.s
 else
-# On Bitrig/OpenBSD, morestack isn't used as the segmented stacks are disabled
+# On OpenBSD, morestack isn't used as the segmented stacks are disabled
 all:
 endif
-
 else
 # On Windows we use __chkstk and it only appears in functions with large allocations,
 # so this test wouldn't be reliable.

branches/auto/src/test/run-make/tools.mk

@@ -55,21 +55,15 @@ endif
 ifdef IS_WINDOWS
 	EXTRACFLAGS := -lws2_32 -luserenv
 else
-ifeq ($(UNAME),Darwin)
+ifeq ($(shell uname),Darwin)
 else
-ifeq ($(UNAME),FreeBSD)
+ifeq ($(shell uname),FreeBSD)
 	EXTRACFLAGS := -lm -lpthread -lgcc_s
 else
-ifeq ($(UNAME),Bitrig)
-	EXTRACFLAGS := -lm -lpthread
-	EXTRACXXFLAGS := -lc++ -lc++abi
-else
-ifeq ($(UNAME),OpenBSD)
+ifeq ($(shell uname),OpenBSD)
 	EXTRACFLAGS := -lm -lpthread
 else
 	EXTRACFLAGS := -lm -lrt -ldl -lpthread
-	EXTRACXXFLAGS := -lstdc++
-endif
 endif
 endif
 endif

branches/auto/src/test/run-make/use-extern-for-plugins/Makefile

@@ -1,9 +1,6 @@
 -include ../tools.mk
 
-SKIP_OS := 'FreeBSD OpenBSD Bitrig'
-
-ifneq ($(UNAME),$(findstring $(UNAME),$(SKIP_OS)))
-
+ifneq ($(findstring BSD,$(UNAME)),BSD)
 HOST := $(shell $(RUSTC) -vV | grep 'host:' | sed 's/host: //')
 ifeq ($(findstring i686,$(HOST)),i686)
 TARGET := $(subst i686,x86_64,$(HOST))
@@ -16,6 +13,6 @@ all:
 	$(RUSTC) bar.rs -C extra-filename=-targ --target $(TARGET)
 	$(RUSTC) baz.rs --extern a=$(TMPDIR)/liba-targ.rlib --target $(TARGET)
 else
-# FreeBSD, OpenBSD, and Bitrig support only x86_64 architecture for now
+# FreeBSD & OpenBSD support only x86_64 architecture for now
 all:
 endif

branches/auto/src/test/run-pass/sepcomp-cci.rs

@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// ignore-bitrig
 // compile-flags: -C codegen-units=3
 // aux-build:sepcomp_cci_lib.rs
 

branches/auto/src/test/run-pass/sepcomp-extern.rs

@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// ignore-bitrig
 // compile-flags: -C codegen-units=3
 // aux-build:sepcomp-extern-lib.rs
 

branches/auto/src/test/run-pass/sepcomp-fns-backwards.rs

@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// ignore-bitrig
 // compile-flags: -C codegen-units=3
 
 // Test references to items that haven't been translated yet.

branches/auto/src/test/run-pass/sepcomp-fns.rs

@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// ignore-bitrig
 // compile-flags: -C codegen-units=3
 
 // Test basic separate compilation functionality.  The functions should be able

branches/auto/src/test/run-pass/sepcomp-statics.rs

@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// ignore-bitrig
 // compile-flags: -C codegen-units=3
 
 // Test references to static items across compilation units.

branches/auto/src/test/run-pass/sepcomp-unwind.rs

@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// ignore-bitrig
 // compile-flags: -C codegen-units=3
 
 // Test unwinding through multiple compilation units.

branches/auto/src/test/run-pass/tcp-stress.rs

@@ -11,7 +11,6 @@
 // ignore-linux see joyent/libuv#1189
 // ignore-android needs extra network permissions
 // ignore-openbsd system ulimit (Too many open files)
-// ignore-bitrig system ulimit (Too many open files)
 // exec-env:RUST_LOG=debug
 
 #![feature(rustc_private, libc, old_io, io, std_misc)]