diff --git a/configure b/configure index efa836ca97646..20a5fa390f00b 100755 --- a/configure +++ b/configure @@ -863,11 +863,6 @@ then CFG_DISABLE_JEMALLOC=1 fi -if [ -z "$CFG_ENABLE_CLANG" -a -z "$CFG_GCC" ] -then - err "either clang or gcc is required" -fi - # OS X 10.9, gcc is actually clang. This can cause some confusion in the build # system, so if we find that gcc is clang, we should just use clang directly. if [ $CFG_OSTYPE = apple-darwin -a -z "$CFG_ENABLE_CLANG" ] diff --git a/man/rustc.1 b/man/rustc.1 index b15829db431df..0cb1c5dc32b8e 100644 --- a/man/rustc.1 +++ b/man/rustc.1 @@ -1,4 +1,4 @@ -.TH RUSTC "1" "March 2014" "rustc 0.13.0" "User Commands" +.TH RUSTC "1" "August 2015" "rustc 1.2.0" "User Commands" .SH NAME rustc \- The Rust compiler .SH SYNOPSIS @@ -160,7 +160,7 @@ If the value is 'help', then a list of available CPUs is printed. \fBtarget\-feature\fR='\fI+feature1\fR,\fI\-feature2\fR' A comma\[hy]separated list of features to enable or disable for the target. A preceding '+' enables a feature while a preceding '\-' disables it. -Available features can be discovered through \fItarget\-cpu=help\fR. +Available features can be discovered through \fIllc -mcpu=help\fR. .TP \fBpasses\fR=\fIval\fR A space\[hy]separated list of extra LLVM passes to run. diff --git a/man/rustdoc.1 b/man/rustdoc.1 index 1738354fb43d5..b710c2c3a2560 100644 --- a/man/rustdoc.1 +++ b/man/rustdoc.1 @@ -1,4 +1,4 @@ -.TH RUSTDOC "1" "March 2014" "rustdoc 0.13.0" "User Commands" +.TH RUSTDOC "1" "August 2015" "rustdoc 1.2.0" "User Commands" .SH NAME rustdoc \- generate documentation from Rust source code .SH SYNOPSIS diff --git a/src/libcore/cell.rs b/src/libcore/cell.rs index c83421d3067cd..4c9f16fdaeeb5 100644 --- a/src/libcore/cell.rs +++ b/src/libcore/cell.rs @@ -212,7 +212,7 @@ impl Cell { } } - /// Gets a reference to the underlying `UnsafeCell`. + /// Returns a reference to the underlying `UnsafeCell`. /// /// # Unsafety /// @@ -439,7 +439,7 @@ impl RefCell { } } - /// Gets a reference to the underlying `UnsafeCell`. + /// Returns a reference to the underlying `UnsafeCell`. /// /// This can be used to circumvent `RefCell`'s safety checks. /// @@ -671,8 +671,8 @@ impl UnsafeCell { /// /// # Unsafety /// - /// This function is unsafe because there is no guarantee that this or other threads are - /// currently inspecting the inner value. + /// This function is unsafe because this thread or another thread may currently be + /// inspecting the inner value. /// /// # Examples /// diff --git a/src/librustc_trans/back/link.rs b/src/librustc_trans/back/link.rs index 844a0a698677f..c416a9810eb0e 100644 --- a/src/librustc_trans/back/link.rs +++ b/src/librustc_trans/back/link.rs @@ -279,7 +279,7 @@ pub fn sanitize(s: &str) -> String { } pub fn mangle>(path: PI, - hash: Option<&str>) -> String { + hash: Option<&str>) -> String { // Follow C++ namespace-mangling style, see // http://en.wikipedia.org/wiki/Name_mangling for more info. // diff --git a/src/librustc_trans/back/write.rs b/src/librustc_trans/back/write.rs index bd16e018bc465..5352c61d8c0ad 100644 --- a/src/librustc_trans/back/write.rs +++ b/src/librustc_trans/back/write.rs @@ -342,8 +342,8 @@ struct HandlerFreeVars<'a> { } unsafe extern "C" fn report_inline_asm<'a, 'b>(cgcx: &'a CodegenContext<'a>, - msg: &'b str, - cookie: c_uint) { + msg: &'b str, + cookie: c_uint) { use syntax::codemap::ExpnId; match cgcx.lto_ctxt { diff --git a/src/libstd/env.rs b/src/libstd/env.rs index 0b9c659ea2e5b..379c925b5750e 100644 --- a/src/libstd/env.rs +++ b/src/libstd/env.rs @@ -598,40 +598,94 @@ pub fn page_size() -> usize { pub mod consts { /// A string describing the architecture of the CPU that this is currently /// in use. + /// + /// Some possible values: + /// + /// - x86 + /// - x86_64 + /// - arm + /// - aarch64 + /// - mips + /// - mipsel + /// - powerpc #[stable(feature = "env", since = "1.0.0")] pub const ARCH: &'static str = super::arch::ARCH; /// The family of the operating system. In this case, `unix`. + /// + /// Some possible values: + /// + /// - unix + /// - windows #[stable(feature = "env", since = "1.0.0")] pub const FAMILY: &'static str = super::os::FAMILY; /// A string describing the specific operating system in use: in this /// case, `linux`. + /// + /// Some possible values: + /// + /// - linux + /// - macos + /// - ios + /// - freebsd + /// - dragonfly + /// - bitrig + /// - openbsd + /// - android + /// - windows #[stable(feature = "env", since = "1.0.0")] pub const OS: &'static str = super::os::OS; /// Specifies the filename prefix used for shared libraries on this /// platform: in this case, `lib`. + /// + /// Some possible values: + /// + /// - lib + /// - `""` (an empty string) #[stable(feature = "env", since = "1.0.0")] pub const DLL_PREFIX: &'static str = super::os::DLL_PREFIX; /// Specifies the filename suffix used for shared libraries on this /// platform: in this case, `.so`. + /// + /// Some possible values: + /// + /// - .so + /// - .dylib + /// - .dll #[stable(feature = "env", since = "1.0.0")] pub const DLL_SUFFIX: &'static str = super::os::DLL_SUFFIX; /// Specifies the file extension used for shared libraries on this /// platform that goes after the dot: in this case, `so`. + /// + /// Some possible values: + /// + /// - .so + /// - .dylib + /// - .dll #[stable(feature = "env", since = "1.0.0")] pub const DLL_EXTENSION: &'static str = super::os::DLL_EXTENSION; /// Specifies the filename suffix used for executable binaries on this /// platform: in this case, the empty string. + /// + /// Some possible values: + /// + /// - exe + /// - `""` (an empty string) #[stable(feature = "env", since = "1.0.0")] pub const EXE_SUFFIX: &'static str = super::os::EXE_SUFFIX; /// Specifies the file extension, if any, used for executable binaries /// on this platform: in this case, the empty string. + /// + /// Some possible values: + /// + /// - exe + /// - `""` (an empty string) #[stable(feature = "env", since = "1.0.0")] pub const EXE_EXTENSION: &'static str = super::os::EXE_EXTENSION; diff --git a/src/libstd/fs.rs b/src/libstd/fs.rs index 31b427d3fa768..b60a84da81ddf 100644 --- a/src/libstd/fs.rs +++ b/src/libstd/fs.rs @@ -844,6 +844,8 @@ pub fn symlink_metadata>(path: P) -> io::Result { /// Rename a file or directory to a new name. /// +/// This will not work if the new name is on a different mount point. +/// /// # Errors /// /// This function will return an error if the provided `from` doesn't exist, if diff --git a/src/test/compile-fail/asm-src-loc-codegen-units.rs b/src/test/compile-fail/asm-src-loc-codegen-units.rs index 5ebcdb20b1952..79f0c436759b3 100644 --- a/src/test/compile-fail/asm-src-loc-codegen-units.rs +++ b/src/test/compile-fail/asm-src-loc-codegen-units.rs @@ -8,7 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// ignore-stage1 (#20184) +// WONTFIX(#20184) Needs landing pads (not present in stage1) or the compiler hangs. +// ignore-stage1 // compile-flags: -C codegen-units=2 // error-pattern: build without -C codegen-units for more exact errors