Skip to content

Commit 7189ae3

Browse files
authored
Auto merge of #34399 - alexcrichton:issue-audit, r=brson
std: Fix up stabilization discrepancies * Remove the deprecated `CharRange` type which was forgotten to be removed awhile back. * Stabilize the `os::$platform::raw::pthread_t` type which was intended to be stabilized as part of #32804
2 parents 8c63d12 + c3e8c17 commit 7189ae3

File tree

16 files changed

+26
-31
lines changed

16 files changed

+26
-31
lines changed

src/libcollections/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@
4949
#![feature(specialization)]
5050
#![feature(staged_api)]
5151
#![feature(step_by)]
52-
#![feature(str_char)]
5352
#![feature(unboxed_closures)]
5453
#![feature(unicode)]
5554
#![feature(unique)]

src/libcollections/str.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ use boxed::Box;
3737
pub use core::str::{FromStr, Utf8Error};
3838
#[allow(deprecated)]
3939
#[stable(feature = "rust1", since = "1.0.0")]
40-
pub use core::str::{Lines, LinesAny, CharRange};
40+
pub use core::str::{Lines, LinesAny};
4141
#[stable(feature = "rust1", since = "1.0.0")]
4242
pub use core::str::{Split, RSplit};
4343
#[stable(feature = "rust1", since = "1.0.0")]

src/libcore/str/mod.rs

-16
Original file line numberDiff line numberDiff line change
@@ -1292,22 +1292,6 @@ static UTF8_CHAR_WIDTH: [u8; 256] = [
12921292
4,4,4,4,4,0,0,0,0,0,0,0,0,0,0,0, // 0xFF
12931293
];
12941294

1295-
/// Struct that contains a `char` and the index of the first byte of
1296-
/// the next `char` in a string. This can be used as a data structure
1297-
/// for iterating over the UTF-8 bytes of a string.
1298-
#[derive(Copy, Clone, Debug)]
1299-
#[unstable(feature = "str_char",
1300-
reason = "existence of this struct is uncertain as it is frequently \
1301-
able to be replaced with char.len_utf8() and/or \
1302-
char/char_indices iterators",
1303-
issue = "27754")]
1304-
pub struct CharRange {
1305-
/// Current `char`
1306-
pub ch: char,
1307-
/// Index of the first byte of the next `char`
1308-
pub next: usize,
1309-
}
1310-
13111295
/// Mask of the value bits of a continuation byte
13121296
const CONT_MASK: u8 = 0b0011_1111;
13131297
/// Value of the tag bits (tag mask is !CONT_MASK) of a continuation byte

src/libstd/os/android/raw.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@
2020

2121
use os::raw::c_long;
2222

23-
#[unstable(feature = "pthread_t", issue = "29791")] pub type pthread_t = c_long;
23+
#[stable(feature = "pthread_t", since = "1.8.0")]
24+
pub type pthread_t = c_long;
2425

2526
#[doc(inline)]
2627
#[stable(feature = "raw_ext", since = "1.1.0")]

src/libstd/os/bitrig/raw.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ use os::unix::raw::{uid_t, gid_t};
3131
#[stable(feature = "raw_ext", since = "1.1.0")] pub type off_t = u64;
3232
#[stable(feature = "raw_ext", since = "1.1.0")] pub type time_t = i64;
3333

34-
#[unstable(feature = "pthread_t", issue = "29791")] pub type pthread_t = usize;
34+
#[stable(feature = "pthread_t", since = "1.8.0")]
35+
pub type pthread_t = usize;
3536

3637
#[repr(C)]
3738
#[derive(Clone)]

src/libstd/os/dragonfly/raw.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@ use os::raw::c_long;
3030
#[stable(feature = "raw_ext", since = "1.1.0")] pub type off_t = u64;
3131
#[stable(feature = "raw_ext", since = "1.1.0")] pub type time_t = i64;
3232

33-
#[unstable(feature = "pthread_t", issue = "29791")] pub type pthread_t = usize;
33+
#[stable(feature = "pthread_t", since = "1.8.0")]
34+
pub type pthread_t = usize;
3435

3536
#[repr(C)]
3637
#[derive(Clone)]

src/libstd/os/emscripten/raw.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ use os::raw::{c_long, c_short, c_uint, c_ulong};
2525
#[stable(feature = "raw_ext", since = "1.1.0")] pub type dev_t = u64;
2626
#[stable(feature = "raw_ext", since = "1.1.0")] pub type mode_t = u32;
2727

28-
#[unstable(feature = "pthread_t", issue = "29791")] pub type pthread_t = c_ulong;
28+
#[stable(feature = "pthread_t", since = "1.8.0")]
29+
pub type pthread_t = c_ulong;
2930

3031
#[doc(inline)]
3132
#[stable(feature = "raw_ext", since = "1.1.0")] pub type blkcnt_t = u64;

src/libstd/os/freebsd/raw.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@ use os::raw::c_long;
3030
#[stable(feature = "raw_ext", since = "1.1.0")] pub type off_t = u64;
3131
#[stable(feature = "raw_ext", since = "1.1.0")] pub type time_t = i64;
3232

33-
#[unstable(feature = "pthread_t", issue = "29791")] pub type pthread_t = usize;
33+
#[stable(feature = "pthread_t", since = "1.8.0")]
34+
pub type pthread_t = usize;
3435

3536
#[repr(C)]
3637
#[derive(Clone)]

src/libstd/os/ios/raw.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ use os::raw::c_long;
2929
#[stable(feature = "raw_ext", since = "1.1.0")] pub type off_t = u64;
3030
#[stable(feature = "raw_ext", since = "1.1.0")] pub type time_t = i64;
3131

32-
#[unstable(feature = "pthread_t", issue = "29791")] pub type pthread_t = usize;
32+
#[stable(feature = "pthread_t", since = "1.8.0")]
33+
pub type pthread_t = usize;
3334

3435
#[repr(C)]
3536
#[derive(Clone)]

src/libstd/os/linux/raw.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ use os::raw::c_ulong;
2323
#[stable(feature = "raw_ext", since = "1.1.0")] pub type dev_t = u64;
2424
#[stable(feature = "raw_ext", since = "1.1.0")] pub type mode_t = u32;
2525

26-
#[unstable(feature = "pthread_t", issue = "29791")] pub type pthread_t = c_ulong;
26+
#[stable(feature = "pthread_t", since = "1.8.0")]
27+
pub type pthread_t = c_ulong;
2728

2829
#[doc(inline)]
2930
#[stable(feature = "raw_ext", since = "1.1.0")]

src/libstd/os/macos/raw.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ use os::raw::c_long;
2929
#[stable(feature = "raw_ext", since = "1.1.0")] pub type off_t = u64;
3030
#[stable(feature = "raw_ext", since = "1.1.0")] pub type time_t = i64;
3131

32-
#[unstable(feature = "pthread_t", issue = "29791")] pub type pthread_t = usize;
32+
#[stable(feature = "pthread_t", since = "1.8.0")]
33+
pub type pthread_t = usize;
3334

3435
#[repr(C)]
3536
#[derive(Clone)]

src/libstd/os/nacl/raw.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@
3030
#[stable(feature = "raw_ext", since = "1.1.0")] pub type blksize_t = u64;
3131
#[stable(feature = "raw_ext", since = "1.1.0")] pub type blkcnt_t = u64;
3232

33-
#[unstable(feature = "pthread_t", issue = "29791")] pub type pthread_t = usize;
33+
#[stable(feature = "pthread_t", since = "1.8.0")]
34+
pub type pthread_t = usize;
3435

3536
#[repr(C)]
3637
#[derive(Copy, Clone)]

src/libstd/os/netbsd/raw.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ use os::unix::raw::{uid_t, gid_t};
3131
#[stable(feature = "raw_ext", since = "1.1.0")] pub type off_t = u64;
3232
#[stable(feature = "raw_ext", since = "1.1.0")] pub type time_t = i64;
3333

34-
#[unstable(feature = "pthread_t", issue = "29791")] pub type pthread_t = usize;
34+
#[stable(feature = "pthread_t", since = "1.8.0")]
35+
pub type pthread_t = usize;
3536

3637
#[repr(C)]
3738
#[derive(Clone)]

src/libstd/os/openbsd/raw.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@ use os::raw::c_long;
3030
#[stable(feature = "raw_ext", since = "1.1.0")] pub type off_t = u64;
3131
#[stable(feature = "raw_ext", since = "1.1.0")] pub type time_t = i64;
3232

33-
#[unstable(feature = "pthread_t", issue = "29791")] pub type pthread_t = usize;
33+
#[stable(feature = "pthread_t", since = "1.8.0")]
34+
pub type pthread_t = usize;
3435

3536
#[repr(C)]
3637
#[derive(Clone)]

src/libstd/os/solaris/raw.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ use os::unix::raw::{uid_t, gid_t};
3131
#[stable(feature = "raw_ext", since = "1.1.0")] pub type off_t = u64;
3232
#[stable(feature = "raw_ext", since = "1.1.0")] pub type time_t = i64;
3333

34-
#[unstable(feature = "pthread_t", issue = "29791")] pub type pthread_t = usize;
34+
#[stable(feature = "pthread_t", since = "1.8.0")]
35+
pub type pthread_t = usize;
3536

3637
#[repr(C)]
3738
#[derive(Clone)]

src/libstd/sys/unix/ext/raw.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#[stable(feature = "raw_ext", since = "1.1.0")] pub type pid_t = i32;
2424

2525
#[doc(inline)]
26-
#[unstable(feature = "pthread_t", issue = "29791")]
26+
#[stable(feature = "pthread_t", since = "1.8.0")]
2727
pub use sys::platform::raw::pthread_t;
2828
#[doc(inline)]
2929
#[stable(feature = "raw_ext", since = "1.1.0")]

0 commit comments

Comments
 (0)