Skip to content

Commit 139d12f

Browse files
committed
Auto merge of #42161 - brson:beta-next, r=alexcrichton
[beta] backports - #42006 - #41904 Bumps the version so we get a new beta. @sfackler libs backports here @nikomatsakis there are several other nominated PRs that don't cherry-pick cleanly: https://github.com/rust-lang/rust/pulls?q=is%3Apr+label%3Abeta-nominated+is%3Aclosed. Can you take a look or recruit someone else to? r? @alexcrichton
2 parents 191cde0 + 61063b0 commit 139d12f

File tree

16 files changed

+46
-83
lines changed

16 files changed

+46
-83
lines changed

src/bootstrap/channel.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ pub const CFG_RELEASE_NUM: &'static str = "1.18.0";
2828
// An optional number to put after the label, e.g. '.2' -> '-beta.2'
2929
// Be sure to make this starts with a dot to conform to semver pre-release
3030
// versions (section 9)
31-
pub const CFG_PRERELEASE_VERSION: &'static str = ".2";
31+
pub const CFG_PRERELEASE_VERSION: &'static str = ".3";
3232

3333
pub struct GitInfo {
3434
inner: Option<Info>,

src/doc/unstable-book/src/SUMMARY.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,6 @@
103103
- [alloc](library-features/alloc.md)
104104
- [as_c_str](library-features/as-c-str.md)
105105
- [ascii_ctype](library-features/ascii-ctype.md)
106-
- [binary_heap_peek_mut_pop](library-features/binary-heap-peek-mut-pop.md)
107106
- [box_heap](library-features/box-heap.md)
108107
- [c_void_variant](library-features/c-void-variant.md)
109108
- [char_escape_debug](library-features/char-escape-debug.md)
@@ -172,17 +171,14 @@
172171
- [panic_abort](library-features/panic-abort.md)
173172
- [panic_unwind](library-features/panic-unwind.md)
174173
- [pattern](library-features/pattern.md)
175-
- [peek](library-features/peek.md)
176174
- [placement_in](library-features/placement-in.md)
177175
- [placement_new_protocol](library-features/placement-new-protocol.md)
178176
- [print](library-features/print.md)
179177
- [proc_macro_internals](library-features/proc-macro-internals.md)
180-
- [process_try_wait](library-features/process-try-wait.md)
181178
- [question_mark_carrier](library-features/question-mark-carrier.md)
182179
- [rand](library-features/rand.md)
183180
- [range_contains](library-features/range-contains.md)
184181
- [raw](library-features/raw.md)
185-
- [retain_hash_collection](library-features/retain-hash-collection.md)
186182
- [reverse_cmp_key](library-features/reverse-cmp-key.md)
187183
- [rt](library-features/rt.md)
188184
- [rustc_private](library-features/rustc-private.md)

src/doc/unstable-book/src/library-features/binary-heap-peek-mut-pop.md

Lines changed: 0 additions & 7 deletions
This file was deleted.

src/doc/unstable-book/src/library-features/peek.md

Lines changed: 0 additions & 7 deletions
This file was deleted.

src/doc/unstable-book/src/library-features/process-try-wait.md

Lines changed: 0 additions & 7 deletions
This file was deleted.

src/doc/unstable-book/src/library-features/retain-hash-collection.md

Lines changed: 0 additions & 7 deletions
This file was deleted.

src/libcollections/binary_heap.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ impl<'a, T: Ord> DerefMut for PeekMut<'a, T> {
268268

269269
impl<'a, T: Ord> PeekMut<'a, T> {
270270
/// Removes the peeked value from the heap and returns it.
271-
#[unstable(feature = "binary_heap_peek_mut_pop", issue = "38863")]
271+
#[stable(feature = "binary_heap_peek_mut_pop", since = "1.18.0")]
272272
pub fn pop(mut this: PeekMut<'a, T>) -> T {
273273
let value = this.heap.pop().unwrap();
274274
this.sift = false;

src/libcollections/tests/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010

1111
#![deny(warnings)]
1212

13-
#![feature(binary_heap_peek_mut_pop)]
1413
#![feature(box_syntax)]
1514
#![feature(inclusive_range_syntax)]
1615
#![feature(collection_placement)]

src/libstd/collections/hash/map.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1231,14 +1231,13 @@ impl<K, V, S> HashMap<K, V, S>
12311231
/// # Examples
12321232
///
12331233
/// ```
1234-
/// #![feature(retain_hash_collection)]
12351234
/// use std::collections::HashMap;
12361235
///
12371236
/// let mut map: HashMap<isize, isize> = (0..8).map(|x|(x, x*10)).collect();
12381237
/// map.retain(|&k, _| k % 2 == 0);
12391238
/// assert_eq!(map.len(), 4);
12401239
/// ```
1241-
#[unstable(feature = "retain_hash_collection", issue = "36648")]
1240+
#[stable(feature = "retain_hash_collection", since = "1.18.0")]
12421241
pub fn retain<F>(&mut self, mut f: F)
12431242
where F: FnMut(&K, &mut V) -> bool
12441243
{

src/libstd/collections/hash/set.rs

Lines changed: 21 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -116,8 +116,6 @@ use super::map::{self, HashMap, Keys, RandomState};
116116
/// [`HashMap`]: struct.HashMap.html
117117
/// [`PartialEq`]: ../../std/cmp/trait.PartialEq.html
118118
/// [`RefCell`]: ../../std/cell/struct.RefCell.html
119-
120-
121119
#[derive(Clone)]
122120
#[stable(feature = "rust1", since = "1.0.0")]
123121
pub struct HashSet<T, S = RandomState> {
@@ -658,15 +656,14 @@ impl<T, S> HashSet<T, S>
658656
/// # Examples
659657
///
660658
/// ```
661-
/// #![feature(retain_hash_collection)]
662659
/// use std::collections::HashSet;
663660
///
664661
/// let xs = [1,2,3,4,5,6];
665662
/// let mut set: HashSet<isize> = xs.iter().cloned().collect();
666663
/// set.retain(|&k| k % 2 == 0);
667664
/// assert_eq!(set.len(), 3);
668665
/// ```
669-
#[unstable(feature = "retain_hash_collection", issue = "36648")]
666+
#[stable(feature = "retain_hash_collection", since = "1.18.0")]
670667
pub fn retain<F>(&mut self, mut f: F)
671668
where F: FnMut(&T) -> bool
672669
{
@@ -1041,9 +1038,7 @@ impl<'a, K> FusedIterator for Iter<'a, K> {}
10411038
#[stable(feature = "std_debug", since = "1.16.0")]
10421039
impl<'a, K: fmt::Debug> fmt::Debug for Iter<'a, K> {
10431040
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
1044-
f.debug_list()
1045-
.entries(self.clone())
1046-
.finish()
1041+
f.debug_list().entries(self.clone()).finish()
10471042
}
10481043
}
10491044

@@ -1070,10 +1065,11 @@ impl<K> FusedIterator for IntoIter<K> {}
10701065
#[stable(feature = "std_debug", since = "1.16.0")]
10711066
impl<K: fmt::Debug> fmt::Debug for IntoIter<K> {
10721067
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
1073-
let entries_iter = self.iter.inner.iter().map(|(k, _)| k);
1074-
f.debug_list()
1075-
.entries(entries_iter)
1076-
.finish()
1068+
let entries_iter = self.iter
1069+
.inner
1070+
.iter()
1071+
.map(|(k, _)| k);
1072+
f.debug_list().entries(entries_iter).finish()
10771073
}
10781074
}
10791075

@@ -1100,10 +1096,11 @@ impl<'a, K> FusedIterator for Drain<'a, K> {}
11001096
#[stable(feature = "std_debug", since = "1.16.0")]
11011097
impl<'a, K: fmt::Debug> fmt::Debug for Drain<'a, K> {
11021098
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
1103-
let entries_iter = self.iter.inner.iter().map(|(k, _)| k);
1104-
f.debug_list()
1105-
.entries(entries_iter)
1106-
.finish()
1099+
let entries_iter = self.iter
1100+
.inner
1101+
.iter()
1102+
.map(|(k, _)| k);
1103+
f.debug_list().entries(entries_iter).finish()
11071104
}
11081105
}
11091106

@@ -1143,12 +1140,10 @@ impl<'a, T, S> Iterator for Intersection<'a, T, S>
11431140
#[stable(feature = "std_debug", since = "1.16.0")]
11441141
impl<'a, T, S> fmt::Debug for Intersection<'a, T, S>
11451142
where T: fmt::Debug + Eq + Hash,
1146-
S: BuildHasher,
1143+
S: BuildHasher
11471144
{
11481145
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
1149-
f.debug_list()
1150-
.entries(self.clone())
1151-
.finish()
1146+
f.debug_list().entries(self.clone()).finish()
11521147
}
11531148
}
11541149

@@ -1202,12 +1197,10 @@ impl<'a, T, S> FusedIterator for Difference<'a, T, S>
12021197
#[stable(feature = "std_debug", since = "1.16.0")]
12031198
impl<'a, T, S> fmt::Debug for Difference<'a, T, S>
12041199
where T: fmt::Debug + Eq + Hash,
1205-
S: BuildHasher,
1200+
S: BuildHasher
12061201
{
12071202
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
1208-
f.debug_list()
1209-
.entries(self.clone())
1210-
.finish()
1203+
f.debug_list().entries(self.clone()).finish()
12111204
}
12121205
}
12131206

@@ -1243,12 +1236,10 @@ impl<'a, T, S> FusedIterator for SymmetricDifference<'a, T, S>
12431236
#[stable(feature = "std_debug", since = "1.16.0")]
12441237
impl<'a, T, S> fmt::Debug for SymmetricDifference<'a, T, S>
12451238
where T: fmt::Debug + Eq + Hash,
1246-
S: BuildHasher,
1239+
S: BuildHasher
12471240
{
12481241
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
1249-
f.debug_list()
1250-
.entries(self.clone())
1251-
.finish()
1242+
f.debug_list().entries(self.clone()).finish()
12521243
}
12531244
}
12541245

@@ -1269,12 +1260,10 @@ impl<'a, T, S> FusedIterator for Union<'a, T, S>
12691260
#[stable(feature = "std_debug", since = "1.16.0")]
12701261
impl<'a, T, S> fmt::Debug for Union<'a, T, S>
12711262
where T: fmt::Debug + Eq + Hash,
1272-
S: BuildHasher,
1263+
S: BuildHasher
12731264
{
12741265
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
1275-
f.debug_list()
1276-
.entries(self.clone())
1277-
.finish()
1266+
f.debug_list().entries(self.clone()).finish()
12781267
}
12791268
}
12801269

@@ -1698,7 +1687,7 @@ mod test_set {
16981687

16991688
#[test]
17001689
fn test_retain() {
1701-
let xs = [1,2,3,4,5,6];
1690+
let xs = [1, 2, 3, 4, 5, 6];
17021691
let mut set: HashSet<isize> = xs.iter().cloned().collect();
17031692
set.retain(|&k| k % 2 == 0);
17041693
assert_eq!(set.len(), 3);

0 commit comments

Comments
 (0)