From 1ad0919fa9a9404ba82125c2c654f3d8c25a202b Mon Sep 17 00:00:00 2001 From: Jonathan Behrens Date: Thu, 13 Sep 2018 14:58:13 -0400 Subject: Remove println!() statement from HashMap unit test --- src/libstd/collections/hash/map.rs | 1 - 1 file changed, 1 deletion(-) (limited to 'src/libstd') diff --git a/src/libstd/collections/hash/map.rs b/src/libstd/collections/hash/map.rs index 804d43f4fc6..eb63d547dd5 100644 --- a/src/libstd/collections/hash/map.rs +++ b/src/libstd/collections/hash/map.rs @@ -3537,7 +3537,6 @@ mod test_map { match m.entry(x) { Vacant(_) => {} Occupied(e) => { - println!("{}: remove {}", i, x); e.remove(); } } -- cgit 1.4.1-3-g733a5 From e9583628b2dcc389a69999e5ff431b70c1561488 Mon Sep 17 00:00:00 2001 From: Jonathan Behrens Date: Thu, 13 Sep 2018 16:48:09 -0400 Subject: Eliminate unused variable warning --- src/libstd/collections/hash/map.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/libstd') diff --git a/src/libstd/collections/hash/map.rs b/src/libstd/collections/hash/map.rs index eb63d547dd5..ef5dae724b2 100644 --- a/src/libstd/collections/hash/map.rs +++ b/src/libstd/collections/hash/map.rs @@ -3532,7 +3532,7 @@ 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(_) => {} -- cgit 1.4.1-3-g733a5 From 2e75b07eee8f506e3410c199444abf60b9062055 Mon Sep 17 00:00:00 2001 From: Josh Stone Date: Thu, 13 Sep 2018 14:25:43 -0700 Subject: Fix the stable release of os_str_str_ref_eq This was added and stabilized in commit 02503029b83a, but while that claimed to be for 1.28.0, it didn't actually make it until 1.29.0. --- src/libstd/ffi/os_str.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/libstd') 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 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 for &'a str { fn eq(&self, other: &OsString) -> bool { **other == **self -- cgit 1.4.1-3-g733a5 From dda7e0dec6d3a9dd3a89d6483b81f3d1511ec63a Mon Sep 17 00:00:00 2001 From: QuietMisdreavus Date: Thu, 13 Sep 2018 17:31:56 -0500 Subject: re-mark the never docs as unstable --- src/libstd/primitive_docs.rs | 1 + 1 file changed, 1 insertion(+) (limited to 'src/libstd') 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")] -- cgit 1.4.1-3-g733a5