diff options
| author | bors <bors@rust-lang.org> | 2018-09-14 07:18:25 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-09-14 07:18:25 +0000 |
| commit | fccde0018a618eb6f45d2a3c97f629809994dff6 (patch) | |
| tree | d4c725cd7dfd72336822e39f899c27dbf13a6d99 /src/libstd | |
| parent | 6ff0b2ed163dab4389d88b14b5729514c11c682e (diff) | |
| parent | dd4f5a2d48d986e0bf23b7cc690d3c2422d4391a (diff) | |
| download | rust-fccde0018a618eb6f45d2a3c97f629809994dff6.tar.gz rust-fccde0018a618eb6f45d2a3c97f629809994dff6.zip | |
Auto merge of #54215 - kennytm:rollup, r=kennytm
Rollup of 8 pull requests Successful merges: - #53218 (Add a implementation of `From` for converting `&'a Option<T>` into `Option<&'a T>`) - #54024 (Fix compiling some rustc crates to wasm) - #54095 (Rename all mentions of `nil` to `unit`) - #54173 (Suggest valid crate type if invalid crate type is found) - #54194 (Remove println!() statement from HashMap unit test) - #54203 (Fix the stable release of os_str_str_ref_eq) - #54207 (re-mark the never docs as unstable) - #54210 (Update Cargo) Failed merges: r? @ghost
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/collections/hash/map.rs | 3 | ||||
| -rw-r--r-- | src/libstd/ffi/os_str.rs | 4 | ||||
| -rw-r--r-- | src/libstd/primitive_docs.rs | 1 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/libstd/collections/hash/map.rs b/src/libstd/collections/hash/map.rs index 804d43f4fc6..ef5dae724b2 100644 --- a/src/libstd/collections/hash/map.rs +++ b/src/libstd/collections/hash/map.rs @@ -3532,12 +3532,11 @@ mod test_map { m.insert(x, ()); } - for i in 0..1000 { + for _ in 0..1000 { let x = rng.gen_range(-10, 10); match m.entry(x) { Vacant(_) => {} Occupied(e) => { - println!("{}: remove {}", i, x); e.remove(); } } diff --git a/src/libstd/ffi/os_str.rs b/src/libstd/ffi/os_str.rs index 8ae5e20dac5..237af2f04e5 100644 --- a/src/libstd/ffi/os_str.rs +++ b/src/libstd/ffi/os_str.rs @@ -420,14 +420,14 @@ impl PartialEq<OsString> for str { } } -#[stable(feature = "os_str_str_ref_eq", since = "1.28.0")] +#[stable(feature = "os_str_str_ref_eq", since = "1.29.0")] impl<'a> PartialEq<&'a str> for OsString { fn eq(&self, other: &&'a str) -> bool { **self == **other } } -#[stable(feature = "os_str_str_ref_eq", since = "1.28.0")] +#[stable(feature = "os_str_str_ref_eq", since = "1.29.0")] impl<'a> PartialEq<OsString> for &'a str { fn eq(&self, other: &OsString) -> bool { **other == **self diff --git a/src/libstd/primitive_docs.rs b/src/libstd/primitive_docs.rs index 7074928eaf6..4c1fdc4f895 100644 --- a/src/libstd/primitive_docs.rs +++ b/src/libstd/primitive_docs.rs @@ -250,6 +250,7 @@ mod prim_bool { } /// [`Default`]: default/trait.Default.html /// [`default()`]: default/trait.Default.html#tymethod.default /// +#[unstable(feature = "never_type", issue = "35121")] mod prim_never { } #[doc(primitive = "char")] |