Skip to content

Commit 4f074de

Browse files
committed
Auto merge of #67964 - JohnTitor:rollup-pu5kosl, r=JohnTitor
Rollup of 13 pull requests Successful merges: - #67566 (Add an unstable conversion from thread ID to u64) - #67671 (Account for `type X = impl Trait;` in lifetime suggestion) - #67727 (Stabilise vec::remove_item) - #67877 (Omit underscore constants from rustdoc) - #67880 (Handle multiple error fix suggestions carefuly) - #67898 (Improve hygiene of `newtype_index`) - #67908 (rustdoc: HTML escape const values) - #67909 (Fix ICE in const pretty printing and resolve FIXME) - #67929 (Formatting an example for method Vec.retain) - #67934 (Clean up E0178 explanation) - #67936 (fire "non_camel_case_types" for associated types) - #67943 (Missing module std in example.) - #67962 (Update books) Failed merges: r? @ghost
2 parents aa0769b + 23d9788 commit 4f074de

File tree

46 files changed

+237
-117
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+237
-117
lines changed

src/doc/nomicon

src/liballoc/tests/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
#![feature(associated_type_bounds)]
1212
#![feature(binary_heap_into_iter_sorted)]
1313
#![feature(binary_heap_drain_sorted)]
14-
#![feature(vec_remove_item)]
1514

1615
use std::collections::hash_map::DefaultHasher;
1716
use std::hash::{Hash, Hasher};

src/liballoc/vec.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1054,7 +1054,7 @@ impl<T> Vec<T> {
10541054
///
10551055
/// ```
10561056
/// let mut vec = vec![1, 2, 3, 4];
1057-
/// vec.retain(|&x| x%2 == 0);
1057+
/// vec.retain(|&x| x % 2 == 0);
10581058
/// assert_eq!(vec, [2, 4]);
10591059
/// ```
10601060
///
@@ -1696,14 +1696,13 @@ impl<T> Vec<T> {
16961696
/// # Examples
16971697
///
16981698
/// ```
1699-
/// # #![feature(vec_remove_item)]
17001699
/// let mut vec = vec![1, 2, 3, 1];
17011700
///
17021701
/// vec.remove_item(&1);
17031702
///
17041703
/// assert_eq!(vec, vec![2, 3, 1]);
17051704
/// ```
1706-
#[unstable(feature = "vec_remove_item", reason = "recently added", issue = "40062")]
1705+
#[stable(feature = "vec_remove_item", since = "1.42.0")]
17071706
pub fn remove_item<V>(&mut self, item: &V) -> Option<T>
17081707
where
17091708
T: PartialEq<V>,

src/librustc/dep_graph/serialized.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
33
use crate::dep_graph::DepNode;
44
use crate::ich::Fingerprint;
5-
use rustc_index::vec::{Idx, IndexVec};
5+
use rustc_index::vec::IndexVec;
66

77
rustc_index::newtype_index! {
88
pub struct SerializedDepNodeIndex { .. }

src/librustc/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@
5050
#![feature(thread_local)]
5151
#![feature(trace_macros)]
5252
#![feature(trusted_len)]
53-
#![feature(vec_remove_item)]
5453
#![feature(stmt_expr_attributes)]
5554
#![feature(integer_atomics)]
5655
#![feature(test)]

0 commit comments

Comments
 (0)