Skip to content

Commit 2e5eb11

Browse files
committed
Changing error message to reflect changes with the 2018 edition
Signed-off-by: Adonis <[email protected]> Update src/libsyntax/ext/tt/quoted.rs Co-Authored-By: asettouf <[email protected]> Update src/libsyntax/ext/tt/quoted.rs Co-Authored-By: asettouf <[email protected]> Update src/libsyntax/ext/tt/quoted.rs Co-Authored-By: asettouf <[email protected]> Update src/libsyntax/ext/tt/quoted.rs Co-Authored-By: asettouf <[email protected]> Update src/libsyntax/ext/tt/quoted.rs Co-Authored-By: asettouf <[email protected]> Update src/libsyntax/ext/tt/quoted.rs Co-Authored-By: asettouf <[email protected]> Update src/test/ui/macros/macro-at-most-once-rep-2015-ques-rep.stderr Co-Authored-By: asettouf <[email protected]> Update src/test/ui/macros/macro-at-most-once-rep-2015-ques-rep.stderr Co-Authored-By: asettouf <[email protected]> Stabilize split_ascii_whitespace Tracking issue FCP to merge: rust-lang#48656 (comment) fix stabilization order of uniform_paths. hir: add HirId to main Hir nodes Fix `std::os::fortanix_sgx::usercalls::raw::UsercallNrs` Fixes fortanix/rust-sgx#88 Update src/libsyntax/ext/tt/quoted.rs Co-Authored-By: asettouf <[email protected]>
1 parent 3d35a9b commit 2e5eb11

File tree

32 files changed

+289
-152
lines changed

32 files changed

+289
-152
lines changed

src/liballoc/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,6 @@
9898
#![feature(rustc_attrs)]
9999
#![feature(receiver_trait)]
100100
#![feature(specialization)]
101-
#![feature(split_ascii_whitespace)]
102101
#![feature(staged_api)]
103102
#![feature(str_internals)]
104103
#![feature(trusted_len)]

src/liballoc/str.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ pub use core::str::SplitWhitespace;
6868
pub use core::str::pattern;
6969
#[stable(feature = "encode_utf16", since = "1.8.0")]
7070
pub use core::str::EncodeUtf16;
71-
#[unstable(feature = "split_ascii_whitespace", issue = "48656")]
71+
#[stable(feature = "split_ascii_whitespace", since = "1.34.0")]
7272
pub use core::str::SplitAsciiWhitespace;
7373

7474
#[unstable(feature = "slice_concat_ext",

src/libcore/str/mod.rs

+5-6
Original file line numberDiff line numberDiff line change
@@ -2700,7 +2700,6 @@ impl str {
27002700
/// Basic usage:
27012701
///
27022702
/// ```
2703-
/// #![feature(split_ascii_whitespace)]
27042703
/// let mut iter = "A few words".split_ascii_whitespace();
27052704
///
27062705
/// assert_eq!(Some("A"), iter.next());
@@ -2722,7 +2721,7 @@ impl str {
27222721
///
27232722
/// assert_eq!(None, iter.next());
27242723
/// ```
2725-
#[unstable(feature = "split_ascii_whitespace", issue = "48656")]
2724+
#[stable(feature = "split_ascii_whitespace", since = "1.34.0")]
27262725
#[inline]
27272726
pub fn split_ascii_whitespace(&self) -> SplitAsciiWhitespace {
27282727
let inner = self
@@ -4009,7 +4008,7 @@ pub struct SplitWhitespace<'a> {
40094008
///
40104009
/// [`split_ascii_whitespace`]: ../../std/primitive.str.html#method.split_ascii_whitespace
40114010
/// [`str`]: ../../std/primitive.str.html
4012-
#[unstable(feature = "split_ascii_whitespace", issue = "48656")]
4011+
#[stable(feature = "split_ascii_whitespace", since = "1.34.0")]
40134012
#[derive(Clone, Debug)]
40144013
pub struct SplitAsciiWhitespace<'a> {
40154014
inner: Map<Filter<SliceSplit<'a, u8, IsAsciiWhitespace>, IsNotEmpty>, UnsafeBytesToStr>,
@@ -4134,7 +4133,7 @@ impl<'a> DoubleEndedIterator for SplitWhitespace<'a> {
41344133
#[stable(feature = "fused", since = "1.26.0")]
41354134
impl FusedIterator for SplitWhitespace<'_> {}
41364135

4137-
#[unstable(feature = "split_ascii_whitespace", issue = "48656")]
4136+
#[stable(feature = "split_ascii_whitespace", since = "1.34.0")]
41384137
impl<'a> Iterator for SplitAsciiWhitespace<'a> {
41394138
type Item = &'a str;
41404139

@@ -4149,15 +4148,15 @@ impl<'a> Iterator for SplitAsciiWhitespace<'a> {
41494148
}
41504149
}
41514150

4152-
#[unstable(feature = "split_ascii_whitespace", issue = "48656")]
4151+
#[stable(feature = "split_ascii_whitespace", since = "1.34.0")]
41534152
impl<'a> DoubleEndedIterator for SplitAsciiWhitespace<'a> {
41544153
#[inline]
41554154
fn next_back(&mut self) -> Option<&'a str> {
41564155
self.inner.next_back()
41574156
}
41584157
}
41594158

4160-
#[unstable(feature = "split_ascii_whitespace", issue = "48656")]
4159+
#[stable(feature = "split_ascii_whitespace", since = "1.34.0")]
41614160
impl FusedIterator for SplitAsciiWhitespace<'_> {}
41624161

41634162
/// An iterator of [`u16`] over the string encoded as UTF-16.

src/librustc/hir/check_attr.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,7 @@ fn is_c_like_enum(item: &hir::Item) -> bool {
362362
if let hir::ItemKind::Enum(ref def, _) = item.node {
363363
for variant in &def.variants {
364364
match variant.node.data {
365-
hir::VariantData::Unit(_) => { /* continue */ }
365+
hir::VariantData::Unit(..) => { /* continue */ }
366366
_ => { return false; }
367367
}
368368
}

src/librustc/hir/intravisit.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -694,7 +694,7 @@ pub fn walk_pat<'v, V: Visitor<'v>>(visitor: &mut V, pattern: &'v Pat) {
694694
PatKind::Ref(ref subpattern, _) => {
695695
visitor.visit_pat(subpattern)
696696
}
697-
PatKind::Binding(_, canonical_id, ident, ref optional_subpattern) => {
697+
PatKind::Binding(_, canonical_id, _hir_id, ident, ref optional_subpattern) => {
698698
visitor.visit_def_mention(Def::Local(canonical_id));
699699
visitor.visit_ident(ident);
700700
walk_list!(visitor, visit_pat, optional_subpattern);

0 commit comments

Comments
 (0)