Skip to content

Commit

Permalink
std: Fix up stabilization discrepancies
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
alexcrichton committed Jun 23, 2016
1 parent fe96928 commit c3e8c17
Show file tree
Hide file tree
Showing 16 changed files with 26 additions and 31 deletions.
1 change: 0 additions & 1 deletion src/libcollections/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@
#![feature(specialization)]
#![feature(staged_api)]
#![feature(step_by)]
#![feature(str_char)]
#![feature(unboxed_closures)]
#![feature(unicode)]
#![feature(unique)]
Expand Down
2 changes: 1 addition & 1 deletion src/libcollections/str.rs
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ use boxed::Box;
pub use core::str::{FromStr, Utf8Error};
#[allow(deprecated)]
#[stable(feature = "rust1", since = "1.0.0")]
pub use core::str::{Lines, LinesAny, CharRange};
pub use core::str::{Lines, LinesAny};
#[stable(feature = "rust1", since = "1.0.0")]
pub use core::str::{Split, RSplit};
#[stable(feature = "rust1", since = "1.0.0")]
Expand Down
16 changes: 0 additions & 16 deletions src/libcore/str/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1292,22 +1292,6 @@ static UTF8_CHAR_WIDTH: [u8; 256] = [
4,4,4,4,4,0,0,0,0,0,0,0,0,0,0,0, // 0xFF
];

/// Struct that contains a `char` and the index of the first byte of
/// the next `char` in a string. This can be used as a data structure
/// for iterating over the UTF-8 bytes of a string.
#[derive(Copy, Clone, Debug)]
#[unstable(feature = "str_char",
reason = "existence of this struct is uncertain as it is frequently \
able to be replaced with char.len_utf8() and/or \
char/char_indices iterators",
issue = "27754")]
pub struct CharRange {
/// Current `char`
pub ch: char,
/// Index of the first byte of the next `char`
pub next: usize,
}

/// Mask of the value bits of a continuation byte
const CONT_MASK: u8 = 0b0011_1111;
/// Value of the tag bits (tag mask is !CONT_MASK) of a continuation byte
Expand Down
3 changes: 2 additions & 1 deletion src/libstd/os/android/raw.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@

use os::raw::c_long;

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

#[doc(inline)]
#[stable(feature = "raw_ext", since = "1.1.0")]
Expand Down
3 changes: 2 additions & 1 deletion src/libstd/os/bitrig/raw.rs
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@ use os::unix::raw::{uid_t, gid_t};
#[stable(feature = "raw_ext", since = "1.1.0")] pub type off_t = u64;
#[stable(feature = "raw_ext", since = "1.1.0")] pub type time_t = i64;

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

#[repr(C)]
#[derive(Clone)]
Expand Down
3 changes: 2 additions & 1 deletion src/libstd/os/dragonfly/raw.rs
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ use os::raw::c_long;
#[stable(feature = "raw_ext", since = "1.1.0")] pub type off_t = u64;
#[stable(feature = "raw_ext", since = "1.1.0")] pub type time_t = i64;

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

#[repr(C)]
#[derive(Clone)]
Expand Down
3 changes: 2 additions & 1 deletion src/libstd/os/emscripten/raw.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ use os::raw::{c_long, c_short, c_uint, c_ulong};
#[stable(feature = "raw_ext", since = "1.1.0")] pub type dev_t = u64;
#[stable(feature = "raw_ext", since = "1.1.0")] pub type mode_t = u32;

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

#[doc(inline)]
#[stable(feature = "raw_ext", since = "1.1.0")] pub type blkcnt_t = u64;
Expand Down
3 changes: 2 additions & 1 deletion src/libstd/os/freebsd/raw.rs
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ use os::raw::c_long;
#[stable(feature = "raw_ext", since = "1.1.0")] pub type off_t = u64;
#[stable(feature = "raw_ext", since = "1.1.0")] pub type time_t = i64;

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

#[repr(C)]
#[derive(Clone)]
Expand Down
3 changes: 2 additions & 1 deletion src/libstd/os/ios/raw.rs
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ use os::raw::c_long;
#[stable(feature = "raw_ext", since = "1.1.0")] pub type off_t = u64;
#[stable(feature = "raw_ext", since = "1.1.0")] pub type time_t = i64;

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

#[repr(C)]
#[derive(Clone)]
Expand Down
3 changes: 2 additions & 1 deletion src/libstd/os/linux/raw.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ use os::raw::c_ulong;
#[stable(feature = "raw_ext", since = "1.1.0")] pub type dev_t = u64;
#[stable(feature = "raw_ext", since = "1.1.0")] pub type mode_t = u32;

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

#[doc(inline)]
#[stable(feature = "raw_ext", since = "1.1.0")]
Expand Down
3 changes: 2 additions & 1 deletion src/libstd/os/macos/raw.rs
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ use os::raw::c_long;
#[stable(feature = "raw_ext", since = "1.1.0")] pub type off_t = u64;
#[stable(feature = "raw_ext", since = "1.1.0")] pub type time_t = i64;

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

#[repr(C)]
#[derive(Clone)]
Expand Down
3 changes: 2 additions & 1 deletion src/libstd/os/nacl/raw.rs
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@
#[stable(feature = "raw_ext", since = "1.1.0")] pub type blksize_t = u64;
#[stable(feature = "raw_ext", since = "1.1.0")] pub type blkcnt_t = u64;

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

#[repr(C)]
#[derive(Copy, Clone)]
Expand Down
3 changes: 2 additions & 1 deletion src/libstd/os/netbsd/raw.rs
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@ use os::unix::raw::{uid_t, gid_t};
#[stable(feature = "raw_ext", since = "1.1.0")] pub type off_t = u64;
#[stable(feature = "raw_ext", since = "1.1.0")] pub type time_t = i64;

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

#[repr(C)]
#[derive(Clone)]
Expand Down
3 changes: 2 additions & 1 deletion src/libstd/os/openbsd/raw.rs
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ use os::raw::c_long;
#[stable(feature = "raw_ext", since = "1.1.0")] pub type off_t = u64;
#[stable(feature = "raw_ext", since = "1.1.0")] pub type time_t = i64;

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

#[repr(C)]
#[derive(Clone)]
Expand Down
3 changes: 2 additions & 1 deletion src/libstd/os/solaris/raw.rs
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@ use os::unix::raw::{uid_t, gid_t};
#[stable(feature = "raw_ext", since = "1.1.0")] pub type off_t = u64;
#[stable(feature = "raw_ext", since = "1.1.0")] pub type time_t = i64;

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

#[repr(C)]
#[derive(Clone)]
Expand Down
2 changes: 1 addition & 1 deletion src/libstd/sys/unix/ext/raw.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#[stable(feature = "raw_ext", since = "1.1.0")] pub type pid_t = i32;

#[doc(inline)]
#[unstable(feature = "pthread_t", issue = "29791")]
#[stable(feature = "pthread_t", since = "1.8.0")]
pub use sys::platform::raw::pthread_t;
#[doc(inline)]
#[stable(feature = "raw_ext", since = "1.1.0")]
Expand Down

0 comments on commit c3e8c17

Please sign in to comment.