diff options
| author | bors <bors@rust-lang.org> | 2020-06-28 16:44:29 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-06-28 16:44:29 +0000 |
| commit | 2f517ce6f28b5d638cce4c1eccdbe63255b11420 (patch) | |
| tree | 32d461aeb5d988a76a319c6cec6c1d663c282446 /src/libstd | |
| parent | 25687caa2e4e35b31c29e28998710670e9d54ee9 (diff) | |
| parent | 117b734ad6af4f646d47256c97d3e0cc95e6ab90 (diff) | |
Auto merge of #73838 - Manishearth:rollup-jj57e84, r=Manishearth
Rollup of 9 pull requests Successful merges: - #73577 (Add partition_point) - #73757 (Const prop: erase all block-only locals at the end of every block) - #73774 (Make liveness more precise for assignments to fields) - #73795 (Add some `const_compare_raw_pointers`-related regression tests) - #73800 (Forward Hash::write_iN to Hash::write_uN) - #73813 (Rename two `Resolver` traits) - #73817 (Rename clashing_extern_decl to clashing_extern_declarations.) - #73826 (Fix docstring typo) - #73833 (Remove GlobalCtxt::enter_local) Failed merges: r? @ghost
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/io/buffered.rs | 2 | ||||
| -rw-r--r-- | src/libstd/sys/unix/args.rs | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/libstd/io/buffered.rs b/src/libstd/io/buffered.rs index 0737008a94c..b4c91cced43 100644 --- a/src/libstd/io/buffered.rs +++ b/src/libstd/io/buffered.rs @@ -400,7 +400,7 @@ impl<R: Seek> Seek for BufReader<R> { /// in memory, like a `Vec<u8>`. /// /// It is critical to call [`flush`] before `BufWriter<W>` is dropped. Though -/// dropping will attempt to flush the the contents of the buffer, any errors +/// dropping will attempt to flush the contents of the buffer, any errors /// that happen in the process of dropping will be ignored. Calling [`flush`] /// ensures that the buffer is empty and thus dropping will not even attempt /// file operations. diff --git a/src/libstd/sys/unix/args.rs b/src/libstd/sys/unix/args.rs index 1d1cdda1257..773fab36be2 100644 --- a/src/libstd/sys/unix/args.rs +++ b/src/libstd/sys/unix/args.rs @@ -205,7 +205,7 @@ mod imp { #[cfg(target_arch = "aarch64")] extern "C" { fn objc_msgSend(obj: NsId, sel: Sel) -> NsId; - #[cfg_attr(not(bootstrap), allow(clashing_extern_decl))] + #[cfg_attr(not(bootstrap), allow(clashing_extern_declarations))] #[link_name = "objc_msgSend"] fn objc_msgSend_ul(obj: NsId, sel: Sel, i: libc::c_ulong) -> NsId; } @@ -213,7 +213,7 @@ mod imp { #[cfg(not(target_arch = "aarch64"))] extern "C" { fn objc_msgSend(obj: NsId, sel: Sel, ...) -> NsId; - #[cfg_attr(not(bootstrap), allow(clashing_extern_decl))] + #[cfg_attr(not(bootstrap), allow(clashing_extern_declarations))] #[link_name = "objc_msgSend"] fn objc_msgSend_ul(obj: NsId, sel: Sel, ...) -> NsId; } |