diff options
| -rw-r--r-- | mk/cfg/armv7s-apple-ios.mk | 4 | ||||
| -rw-r--r-- | mk/cfg/powerpc64-unknown-linux-gnu.mk | 2 | ||||
| -rw-r--r-- | src/doc/reference.md | 2 | ||||
| -rw-r--r-- | src/libcollections/string.rs | 2 | ||||
| m--------- | src/liblibc | 0 | ||||
| -rw-r--r-- | src/librustdoc/html/format.rs | 2 | ||||
| -rw-r--r-- | src/libstd/sys/unix/thread.rs | 13 | ||||
| -rw-r--r-- | src/test/run-pass/multi-panic.rs | 5 | ||||
| -rw-r--r-- | src/test/rustdoc/tuples.rs | 18 |
9 files changed, 37 insertions, 11 deletions
diff --git a/mk/cfg/armv7s-apple-ios.mk b/mk/cfg/armv7s-apple-ios.mk index 96ca0764894..efad43d2562 100644 --- a/mk/cfg/armv7s-apple-ios.mk +++ b/mk/cfg/armv7s-apple-ios.mk @@ -14,8 +14,8 @@ CFG_LIB_GLOB_armv7s-apple-ios = lib$(1)-*.a CFG_INSTALL_ONLY_RLIB_armv7s-apple-ios = 1 CFG_STATIC_LIB_NAME_armv7s-apple-ios=lib$(1).a CFG_LIB_DSYM_GLOB_armv7s-apple-ios = lib$(1)-*.a.dSYM -CFG_JEMALLOC_CFLAGS_armv7s-apple-ios := -arch armv7s -mfpu=vfp4 $(CFG_IOS_SDK_FLAGS_armv7s-apple-ios) -CFG_GCCISH_CFLAGS_armv7s-apple-ios := -Wall -Werror -g -fPIC $(CFG_IOS_SDK_FLAGS_armv7s-apple-ios) -mfpu=vfp4 -arch armv7s +CFG_JEMALLOC_CFLAGS_armv7s-apple-ios := -arch armv7s $(CFG_IOS_SDK_FLAGS_armv7s-apple-ios) +CFG_GCCISH_CFLAGS_armv7s-apple-ios := -Wall -Werror -g -fPIC $(CFG_IOS_SDK_FLAGS_armv7s-apple-ios) -arch armv7s CFG_GCCISH_CXXFLAGS_armv7s-apple-ios := -fno-rtti $(CFG_IOS_SDK_FLAGS_armv7s-apple-ios) -I$(CFG_IOS_SDK_armv7s-apple-ios)/usr/include/c++/4.2.1 CFG_GCCISH_LINK_FLAGS_armv7s-apple-ios := -lpthread -syslibroot $(CFG_IOS_SDK_armv7s-apple-ios) -Wl,-no_compact_unwind CFG_GCCISH_DEF_FLAG_armv7s-apple-ios := -Wl,-exported_symbols_list, diff --git a/mk/cfg/powerpc64-unknown-linux-gnu.mk b/mk/cfg/powerpc64-unknown-linux-gnu.mk index a9e8585ad6d..cf49c711ba6 100644 --- a/mk/cfg/powerpc64-unknown-linux-gnu.mk +++ b/mk/cfg/powerpc64-unknown-linux-gnu.mk @@ -1,5 +1,5 @@ # powerpc64-unknown-linux-gnu configuration -CROSS_PREFIX_powerpc64-unknown-linux-gnu=powerpc64-linux-gnu- +CROSS_PREFIX_powerpc64-unknown-linux-gnu=powerpc-linux-gnu- CC_powerpc64-unknown-linux-gnu=$(CC) CXX_powerpc64-unknown-linux-gnu=$(CXX) CPP_powerpc64-unknown-linux-gnu=$(CPP) diff --git a/src/doc/reference.md b/src/doc/reference.md index 46fdee2bb5a..9c0538e6a3c 100644 --- a/src/doc/reference.md +++ b/src/doc/reference.md @@ -104,7 +104,7 @@ comments (`/** ... */`), are interpreted as a special syntax for `doc` `#[doc="..."]` around the body of the comment, i.e., `/// Foo` turns into `#[doc="Foo"]`. -Line comments beginning with `//!` and block comments `/*! ... !*/` are +Line comments beginning with `//!` and block comments `/*! ... */` are doc comments that apply to the parent of the comment, rather than the item that follows. That is, they are equivalent to writing `#![doc="..."]` around the body of the comment. `//!` comments are usually used to document diff --git a/src/libcollections/string.rs b/src/libcollections/string.rs index d9cbc4488fc..97c12043e76 100644 --- a/src/libcollections/string.rs +++ b/src/libcollections/string.rs @@ -641,7 +641,7 @@ impl String { Cow::Owned(res) } - /// Decode a UTF-16 encoded vector `v` into a `String`, returning `None` + /// Decode a UTF-16 encoded vector `v` into a `String`, returning `Err` /// if `v` contains any invalid data. /// /// # Examples diff --git a/src/liblibc b/src/liblibc -Subproject af77843345ec6fc7e51113bfd692138d89024bc +Subproject 91ff43c736de664f8d3cd351e148c09cdea6731 diff --git a/src/librustdoc/html/format.rs b/src/librustdoc/html/format.rs index b0df209d3dc..9d5189cfd0b 100644 --- a/src/librustdoc/html/format.rs +++ b/src/librustdoc/html/format.rs @@ -460,7 +460,7 @@ impl fmt::Display for clean::Type { [] => primitive_link(f, clean::PrimitiveTuple, "()"), [ref one] => { try!(primitive_link(f, clean::PrimitiveTuple, "(")); - try!(write!(f, "{}", one)); + try!(write!(f, "{},", one)); primitive_link(f, clean::PrimitiveTuple, ")") } many => { diff --git a/src/libstd/sys/unix/thread.rs b/src/libstd/sys/unix/thread.rs index 9e28cf06d61..0faa1465c32 100644 --- a/src/libstd/sys/unix/thread.rs +++ b/src/libstd/sys/unix/thread.rs @@ -15,7 +15,6 @@ use cmp; #[cfg(not(target_env = "newlib"))] use ffi::CString; use io; -use libc::PTHREAD_STACK_MIN; use libc; use mem; use ptr; @@ -339,14 +338,20 @@ fn min_stack_size(attr: *const libc::pthread_attr_t) -> usize { }); match unsafe { __pthread_get_minstack } { - None => PTHREAD_STACK_MIN as usize, + None => libc::PTHREAD_STACK_MIN as usize, Some(f) => unsafe { f(attr) as usize }, } } // No point in looking up __pthread_get_minstack() on non-glibc // platforms. -#[cfg(not(target_os = "linux"))] +#[cfg(all(not(target_os = "linux"), + not(target_os = "netbsd")))] +fn min_stack_size(_: *const libc::pthread_attr_t) -> usize { + libc::PTHREAD_STACK_MIN as usize +} + +#[cfg(target_os = "netbsd")] fn min_stack_size(_: *const libc::pthread_attr_t) -> usize { - PTHREAD_STACK_MIN as usize + 2048 // just a guess } diff --git a/src/test/run-pass/multi-panic.rs b/src/test/run-pass/multi-panic.rs index 7bf07314dcc..6a0d7278b5e 100644 --- a/src/test/run-pass/multi-panic.rs +++ b/src/test/run-pass/multi-panic.rs @@ -17,7 +17,10 @@ fn main() { panic!(); } else { - let test = std::process::Command::new(&args[0]).arg("run_test").output().unwrap(); + let test = std::process::Command::new(&args[0]).arg("run_test") + .env_remove("RUST_BACKTRACE") + .output() + .unwrap(); assert!(!test.status.success()); let err = String::from_utf8_lossy(&test.stderr); let mut it = err.lines(); diff --git a/src/test/rustdoc/tuples.rs b/src/test/rustdoc/tuples.rs new file mode 100644 index 00000000000..2269b38780d --- /dev/null +++ b/src/test/rustdoc/tuples.rs @@ -0,0 +1,18 @@ +// Copyright 2016 The Rust Project Developers. See the COPYRIGHT +// file at the top-level directory of this distribution and at +// http://rust-lang.org/COPYRIGHT. +// +// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or +// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license +// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +#![crate_name = "foo"] + +// @has foo/fn.tuple0.html //pre 'pub fn tuple0(x: ())' +pub fn tuple0(x: ()) -> () { x } +// @has foo/fn.tuple1.html //pre 'pub fn tuple1(x: (i32,)) -> (i32,)' +pub fn tuple1(x: (i32,)) -> (i32,) { x } +// @has foo/fn.tuple2.html //pre 'pub fn tuple2(x: (i32, i32)) -> (i32, i32)' +pub fn tuple2(x: (i32, i32)) -> (i32, i32) { x } |