trivial cfg(bootstrap) changes
This commit is contained in:
Pietro Albini
parent
e96538aeeb
commit
181d28bb61
42 changed files with 176 additions and 314 deletions
|
|
@ -237,7 +237,6 @@ mod hack {
|
|||
}
|
||||
}
|
||||
|
||||
#[cfg_attr(bootstrap, lang = "slice_alloc")]
|
||||
#[cfg(not(test))]
|
||||
impl<T> [T] {
|
||||
/// Sorts the slice.
|
||||
|
|
@ -267,7 +266,7 @@ impl<T> [T] {
|
|||
/// assert!(v == [-5, -3, 1, 2, 4]);
|
||||
/// ```
|
||||
#[cfg(not(no_global_oom_handling))]
|
||||
#[cfg_attr(not(bootstrap), rustc_allow_incoherent_impl)]
|
||||
#[rustc_allow_incoherent_impl]
|
||||
#[stable(feature = "rust1", since = "1.0.0")]
|
||||
#[inline]
|
||||
pub fn sort(&mut self)
|
||||
|
|
@ -323,7 +322,7 @@ impl<T> [T] {
|
|||
/// assert!(v == [5, 4, 3, 2, 1]);
|
||||
/// ```
|
||||
#[cfg(not(no_global_oom_handling))]
|
||||
#[cfg_attr(not(bootstrap), rustc_allow_incoherent_impl)]
|
||||
#[rustc_allow_incoherent_impl]
|
||||
#[stable(feature = "rust1", since = "1.0.0")]
|
||||
#[inline]
|
||||
pub fn sort_by<F>(&mut self, mut compare: F)
|
||||
|
|
@ -365,7 +364,7 @@ impl<T> [T] {
|
|||
/// assert!(v == [1, 2, -3, 4, -5]);
|
||||
/// ```
|
||||
#[cfg(not(no_global_oom_handling))]
|
||||
#[cfg_attr(not(bootstrap), rustc_allow_incoherent_impl)]
|
||||
#[rustc_allow_incoherent_impl]
|
||||
#[stable(feature = "slice_sort_by_key", since = "1.7.0")]
|
||||
#[inline]
|
||||
pub fn sort_by_key<K, F>(&mut self, mut f: F)
|
||||
|
|
@ -412,7 +411,7 @@ impl<T> [T] {
|
|||
///
|
||||
/// [pdqsort]: https://github.com/orlp/pdqsort
|
||||
#[cfg(not(no_global_oom_handling))]
|
||||
#[cfg_attr(not(bootstrap), rustc_allow_incoherent_impl)]
|
||||
#[rustc_allow_incoherent_impl]
|
||||
#[stable(feature = "slice_sort_by_cached_key", since = "1.34.0")]
|
||||
#[inline]
|
||||
pub fn sort_by_cached_key<K, F>(&mut self, f: F)
|
||||
|
|
@ -471,7 +470,7 @@ impl<T> [T] {
|
|||
/// // Here, `s` and `x` can be modified independently.
|
||||
/// ```
|
||||
#[cfg(not(no_global_oom_handling))]
|
||||
#[cfg_attr(not(bootstrap), rustc_allow_incoherent_impl)]
|
||||
#[rustc_allow_incoherent_impl]
|
||||
#[rustc_conversion_suggestion]
|
||||
#[stable(feature = "rust1", since = "1.0.0")]
|
||||
#[inline]
|
||||
|
|
@ -496,7 +495,7 @@ impl<T> [T] {
|
|||
/// // Here, `s` and `x` can be modified independently.
|
||||
/// ```
|
||||
#[cfg(not(no_global_oom_handling))]
|
||||
#[cfg_attr(not(bootstrap), rustc_allow_incoherent_impl)]
|
||||
#[rustc_allow_incoherent_impl]
|
||||
#[inline]
|
||||
#[unstable(feature = "allocator_api", issue = "32838")]
|
||||
pub fn to_vec_in<A: Allocator>(&self, alloc: A) -> Vec<T, A>
|
||||
|
|
@ -521,7 +520,7 @@ impl<T> [T] {
|
|||
///
|
||||
/// assert_eq!(x, vec![10, 40, 30]);
|
||||
/// ```
|
||||
#[cfg_attr(not(bootstrap), rustc_allow_incoherent_impl)]
|
||||
#[rustc_allow_incoherent_impl]
|
||||
#[stable(feature = "rust1", since = "1.0.0")]
|
||||
#[inline]
|
||||
pub fn into_vec<A: Allocator>(self: Box<Self, A>) -> Vec<T, A> {
|
||||
|
|
@ -549,7 +548,7 @@ impl<T> [T] {
|
|||
/// // this will panic at runtime
|
||||
/// b"0123456789abcdef".repeat(usize::MAX);
|
||||
/// ```
|
||||
#[cfg_attr(not(bootstrap), rustc_allow_incoherent_impl)]
|
||||
#[rustc_allow_incoherent_impl]
|
||||
#[cfg(not(no_global_oom_handling))]
|
||||
#[stable(feature = "repeat_generic_slice", since = "1.40.0")]
|
||||
pub fn repeat(&self, n: usize) -> Vec<T>
|
||||
|
|
@ -618,7 +617,7 @@ impl<T> [T] {
|
|||
/// assert_eq!(["hello", "world"].concat(), "helloworld");
|
||||
/// assert_eq!([[1, 2], [3, 4]].concat(), [1, 2, 3, 4]);
|
||||
/// ```
|
||||
#[cfg_attr(not(bootstrap), rustc_allow_incoherent_impl)]
|
||||
#[rustc_allow_incoherent_impl]
|
||||
#[stable(feature = "rust1", since = "1.0.0")]
|
||||
pub fn concat<Item: ?Sized>(&self) -> <Self as Concat<Item>>::Output
|
||||
where
|
||||
|
|
@ -637,7 +636,7 @@ impl<T> [T] {
|
|||
/// assert_eq!([[1, 2], [3, 4]].join(&0), [1, 2, 0, 3, 4]);
|
||||
/// assert_eq!([[1, 2], [3, 4]].join(&[0, 0][..]), [1, 2, 0, 0, 3, 4]);
|
||||
/// ```
|
||||
#[cfg_attr(not(bootstrap), rustc_allow_incoherent_impl)]
|
||||
#[rustc_allow_incoherent_impl]
|
||||
#[stable(feature = "rename_connect_to_join", since = "1.3.0")]
|
||||
pub fn join<Separator>(&self, sep: Separator) -> <Self as Join<Separator>>::Output
|
||||
where
|
||||
|
|
@ -656,7 +655,7 @@ impl<T> [T] {
|
|||
/// assert_eq!(["hello", "world"].connect(" "), "hello world");
|
||||
/// assert_eq!([[1, 2], [3, 4]].connect(&0), [1, 2, 0, 3, 4]);
|
||||
/// ```
|
||||
#[cfg_attr(not(bootstrap), rustc_allow_incoherent_impl)]
|
||||
#[rustc_allow_incoherent_impl]
|
||||
#[stable(feature = "rust1", since = "1.0.0")]
|
||||
#[rustc_deprecated(since = "1.3.0", reason = "renamed to join")]
|
||||
pub fn connect<Separator>(&self, sep: Separator) -> <Self as Join<Separator>>::Output
|
||||
|
|
@ -667,7 +666,6 @@ impl<T> [T] {
|
|||
}
|
||||
}
|
||||
|
||||
#[cfg_attr(bootstrap, lang = "slice_u8_alloc")]
|
||||
#[cfg(not(test))]
|
||||
impl [u8] {
|
||||
/// Returns a vector containing a copy of this slice where each byte
|
||||
|
|
@ -680,7 +678,7 @@ impl [u8] {
|
|||
///
|
||||
/// [`make_ascii_uppercase`]: slice::make_ascii_uppercase
|
||||
#[cfg(not(no_global_oom_handling))]
|
||||
#[cfg_attr(not(bootstrap), rustc_allow_incoherent_impl)]
|
||||
#[rustc_allow_incoherent_impl]
|
||||
#[must_use = "this returns the uppercase bytes as a new Vec, \
|
||||
without modifying the original"]
|
||||
#[stable(feature = "ascii_methods_on_intrinsics", since = "1.23.0")]
|
||||
|
|
@ -701,7 +699,7 @@ impl [u8] {
|
|||
///
|
||||
/// [`make_ascii_lowercase`]: slice::make_ascii_lowercase
|
||||
#[cfg(not(no_global_oom_handling))]
|
||||
#[cfg_attr(not(bootstrap), rustc_allow_incoherent_impl)]
|
||||
#[rustc_allow_incoherent_impl]
|
||||
#[must_use = "this returns the lowercase bytes as a new Vec, \
|
||||
without modifying the original"]
|
||||
#[stable(feature = "ascii_methods_on_intrinsics", since = "1.23.0")]
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue