diff options
| author | bors <bors@rust-lang.org> | 2019-03-29 08:14:41 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-03-29 08:14:41 +0000 |
| commit | 003382e4150984cb476047b3925edf8d75df2d59 (patch) | |
| tree | 2d72c3517e7bb92371f2e7c01b379da97d185975 /src/libstd | |
| parent | 4fec737f9aad565ef0351c38f147b78394b7a8ac (diff) | |
| parent | 456fa39031f908490a112356373afa3535878a38 (diff) | |
| download | rust-003382e4150984cb476047b3925edf8d75df2d59.tar.gz rust-003382e4150984cb476047b3925edf8d75df2d59.zip | |
Auto merge of #59513 - Centril:rollup, r=Centril
Rollup of 11 pull requests
Successful merges:
- #58019 (Combine all builtin late lints and make lint checking parallel)
- #59358 (Use `track_errors` instead of hand rolling)
- #59394 (warn -> deny duplicate match bindings)
- #59401 (bootstrap: build crates under libtest with -Z emit-stack-sizes)
- #59423 (Visit path in `walk_mac`)
- #59468 (musl: build toolchain libs with -fPIC)
- #59476 (Use `SmallVec` in `TokenStreamBuilder`.)
- #59496 (Remove unnecessary with_globals calls)
- #59498 (Use 'write_all' instead of 'write' in example code)
- #59503 (Stablize {f32,f64}::copysign().)
- #59511 (Fix missed fn rename in #59284)
Failed merges:
r? @ghost
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/f32.rs | 3 | ||||
| -rw-r--r-- | src/libstd/f64.rs | 3 | ||||
| -rw-r--r-- | src/libstd/io/mod.rs | 2 | ||||
| -rw-r--r-- | src/libstd/io/stdio.rs | 12 | ||||
| -rw-r--r-- | src/libstd/sys/sgx/rwlock.rs | 2 |
5 files changed, 10 insertions, 12 deletions
diff --git a/src/libstd/f32.rs b/src/libstd/f32.rs index 796908b0df9..2952c6aea00 100644 --- a/src/libstd/f32.rs +++ b/src/libstd/f32.rs @@ -202,7 +202,6 @@ impl f32 { /// # Examples /// /// ``` - /// #![feature(copysign)] /// use std::f32; /// /// let f = 3.5_f32; @@ -216,7 +215,7 @@ impl f32 { /// ``` #[inline] #[must_use] - #[unstable(feature="copysign", issue="55169")] + #[stable(feature = "copysign", since = "1.35.0")] pub fn copysign(self, y: f32) -> f32 { unsafe { intrinsics::copysignf32(self, y) } } diff --git a/src/libstd/f64.rs b/src/libstd/f64.rs index e679a7d2e8c..3c3a35573ad 100644 --- a/src/libstd/f64.rs +++ b/src/libstd/f64.rs @@ -180,7 +180,6 @@ impl f64 { /// # Examples /// /// ``` - /// #![feature(copysign)] /// use std::f64; /// /// let f = 3.5_f64; @@ -194,7 +193,7 @@ impl f64 { /// ``` #[inline] #[must_use] - #[unstable(feature="copysign", issue="55169")] + #[stable(feature = "copysign", since = "1.35.0")] pub fn copysign(self, y: f64) -> f64 { unsafe { intrinsics::copysignf64(self, y) } } diff --git a/src/libstd/io/mod.rs b/src/libstd/io/mod.rs index 7147b641e47..14c850b6b05 100644 --- a/src/libstd/io/mod.rs +++ b/src/libstd/io/mod.rs @@ -1151,7 +1151,7 @@ pub trait Write { /// fn main() -> std::io::Result<()> { /// let mut buffer = BufWriter::new(File::create("foo.txt")?); /// - /// buffer.write(b"some bytes")?; + /// buffer.write_all(b"some bytes")?; /// buffer.flush()?; /// Ok(()) /// } diff --git a/src/libstd/io/stdio.rs b/src/libstd/io/stdio.rs index d53a294fa6a..7e151041a9e 100644 --- a/src/libstd/io/stdio.rs +++ b/src/libstd/io/stdio.rs @@ -405,7 +405,7 @@ pub struct StdoutLock<'a> { /// use std::io::{self, Write}; /// /// fn main() -> io::Result<()> { -/// io::stdout().write(b"hello world")?; +/// io::stdout().write_all(b"hello world")?; /// /// Ok(()) /// } @@ -420,7 +420,7 @@ pub struct StdoutLock<'a> { /// let stdout = io::stdout(); /// let mut handle = stdout.lock(); /// -/// handle.write(b"hello world")?; +/// handle.write_all(b"hello world")?; /// /// Ok(()) /// } @@ -460,7 +460,7 @@ impl Stdout { /// let stdout = io::stdout(); /// let mut handle = stdout.lock(); /// - /// handle.write(b"hello world")?; + /// handle.write_all(b"hello world")?; /// /// Ok(()) /// } @@ -558,7 +558,7 @@ pub struct StderrLock<'a> { /// use std::io::{self, Write}; /// /// fn main() -> io::Result<()> { -/// io::stderr().write(b"hello world")?; +/// io::stderr().write_all(b"hello world")?; /// /// Ok(()) /// } @@ -573,7 +573,7 @@ pub struct StderrLock<'a> { /// let stderr = io::stderr(); /// let mut handle = stderr.lock(); /// -/// handle.write(b"hello world")?; +/// handle.write_all(b"hello world")?; /// /// Ok(()) /// } @@ -613,7 +613,7 @@ impl Stderr { /// let stderr = io::stderr(); /// let mut handle = stderr.lock(); /// - /// handle.write(b"hello world")?; + /// handle.write_all(b"hello world")?; /// /// Ok(()) /// } diff --git a/src/libstd/sys/sgx/rwlock.rs b/src/libstd/sys/sgx/rwlock.rs index 7e2d13b9e24..784303f3a65 100644 --- a/src/libstd/sys/sgx/rwlock.rs +++ b/src/libstd/sys/sgx/rwlock.rs @@ -268,7 +268,7 @@ mod tests { #[inline(never)] unsafe fn rwlock_new(init: &mut MaybeUninit<RWLock>) { - init.set(RWLock::new()); + init.write(RWLock::new()); } unsafe { |
