Skip to content

Commit b9fd0ed

Browse files
pietroalbinipietroalbini
committed
remove cfg(bootstrap)
1 parent d33a7b3 commit b9fd0ed

File tree

31 files changed

+12
-1239
lines changed

31 files changed

+12
-1239
lines changed

‎alloc/src/boxed.rs‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,6 @@ use core::async_iter::AsyncIterator;
151151
use core::borrow;
152152
use core::cmp::Ordering;
153153
use core::convert::{From, TryFrom};
154-
#[cfg(not(bootstrap))]
155154
use core::error::Error;
156155
use core::fmt;
157156
use core::future::Future;
@@ -176,7 +175,6 @@ use crate::borrow::Cow;
176175
use crate::raw_vec::RawVec;
177176
#[cfg(not(no_global_oom_handling))]
178177
use crate::str::from_boxed_utf8_unchecked;
179-
#[cfg(not(bootstrap))]
180178
#[cfg(not(no_global_oom_handling))]
181179
use crate::string::String;
182180
#[cfg(not(no_global_oom_handling))]
@@ -2090,7 +2088,6 @@ impl<S: ?Sized + AsyncIterator + Unpin> AsyncIterator for Box<S> {
20902088
}
20912089
}
20922090

2093-
#[cfg(not(bootstrap))]
20942091
impl dyn Error {
20952092
#[inline]
20962093
#[stable(feature = "error_downcast", since = "1.3.0")]
@@ -2108,7 +2105,6 @@ impl dyn Error {
21082105
}
21092106
}
21102107

2111-
#[cfg(not(bootstrap))]
21122108
impl dyn Error + Send {
21132109
#[inline]
21142110
#[stable(feature = "error_downcast", since = "1.3.0")]
@@ -2123,7 +2119,6 @@ impl dyn Error + Send {
21232119
}
21242120
}
21252121

2126-
#[cfg(not(bootstrap))]
21272122
impl dyn Error + Send + Sync {
21282123
#[inline]
21292124
#[stable(feature = "error_downcast", since = "1.3.0")]
@@ -2138,7 +2133,6 @@ impl dyn Error + Send + Sync {
21382133
}
21392134
}
21402135

2141-
#[cfg(not(bootstrap))]
21422136
#[cfg(not(no_global_oom_handling))]
21432137
#[stable(feature = "rust1", since = "1.0.0")]
21442138
impl<'a, E: Error + 'a> From<E> for Box<dyn Error + 'a> {
@@ -2172,7 +2166,6 @@ impl<'a, E: Error + 'a> From<E> for Box<dyn Error + 'a> {
21722166
}
21732167
}
21742168

2175-
#[cfg(not(bootstrap))]
21762169
#[cfg(not(no_global_oom_handling))]
21772170
#[stable(feature = "rust1", since = "1.0.0")]
21782171
impl<'a, E: Error + Send + Sync + 'a> From<E> for Box<dyn Error + Send + Sync + 'a> {
@@ -2212,7 +2205,6 @@ impl<'a, E: Error + Send + Sync + 'a> From<E> for Box<dyn Error + Send + Sync +
22122205
}
22132206
}
22142207

2215-
#[cfg(not(bootstrap))]
22162208
#[cfg(not(no_global_oom_handling))]
22172209
#[stable(feature = "rust1", since = "1.0.0")]
22182210
impl From<String> for Box<dyn Error + Send + Sync> {
@@ -2257,7 +2249,6 @@ impl From<String> for Box<dyn Error + Send + Sync> {
22572249
}
22582250
}
22592251

2260-
#[cfg(not(bootstrap))]
22612252
#[cfg(not(no_global_oom_handling))]
22622253
#[stable(feature = "string_box_error", since = "1.6.0")]
22632254
impl From<String> for Box<dyn Error> {
@@ -2280,7 +2271,6 @@ impl From<String> for Box<dyn Error> {
22802271
}
22812272
}
22822273

2283-
#[cfg(not(bootstrap))]
22842274
#[cfg(not(no_global_oom_handling))]
22852275
#[stable(feature = "rust1", since = "1.0.0")]
22862276
impl<'a> From<&str> for Box<dyn Error + Send + Sync + 'a> {
@@ -2305,7 +2295,6 @@ impl<'a> From<&str> for Box<dyn Error + Send + Sync + 'a> {
23052295
}
23062296
}
23072297

2308-
#[cfg(not(bootstrap))]
23092298
#[cfg(not(no_global_oom_handling))]
23102299
#[stable(feature = "string_box_error", since = "1.6.0")]
23112300
impl From<&str> for Box<dyn Error> {
@@ -2328,7 +2317,6 @@ impl From<&str> for Box<dyn Error> {
23282317
}
23292318
}
23302319

2331-
#[cfg(not(bootstrap))]
23322320
#[cfg(not(no_global_oom_handling))]
23332321
#[stable(feature = "cow_box_error", since = "1.22.0")]
23342322
impl<'a, 'b> From<Cow<'b, str>> for Box<dyn Error + Send + Sync + 'a> {
@@ -2351,7 +2339,6 @@ impl<'a, 'b> From<Cow<'b, str>> for Box<dyn Error + Send + Sync + 'a> {
23512339
}
23522340
}
23532341

2354-
#[cfg(not(bootstrap))]
23552342
#[cfg(not(no_global_oom_handling))]
23562343
#[stable(feature = "cow_box_error", since = "1.22.0")]
23572344
impl<'a> From<Cow<'a, str>> for Box<dyn Error> {
@@ -2373,7 +2360,6 @@ impl<'a> From<Cow<'a, str>> for Box<dyn Error> {
23732360
}
23742361
}
23752362

2376-
#[cfg(not(bootstrap))]
23772363
#[stable(feature = "box_error", since = "1.8.0")]
23782364
impl<T: core::error::Error> core::error::Error for Box<T> {
23792365
#[allow(deprecated, deprecated_in_future)]

‎alloc/src/boxed/thin.rs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
// https://github.com/matthieu-m/rfc2580/blob/b58d1d3cba0d4b5e859d3617ea2d0943aaa31329/examples/thin.rs
33
// by matthieu-m
44
use crate::alloc::{self, Layout, LayoutError};
5-
#[cfg(not(bootstrap))]
65
use core::error::Error;
76
use core::fmt::{self, Debug, Display, Formatter};
87
use core::marker::PhantomData;
@@ -274,7 +273,6 @@ impl<H> WithHeader<H> {
274273
}
275274
}
276275

277-
#[cfg(not(bootstrap))]
278276
#[unstable(feature = "thin_box", issue = "92791")]
279277
impl<T: ?Sized + Error> Error for ThinBox<T> {
280278
fn source(&self) -> Option<&(dyn Error + 'static)> {

‎alloc/src/collections/btree/map/entry.rs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,6 @@ impl<'a, K: Debug + Ord, V: Debug, A: Allocator + Clone> fmt::Display
133133
}
134134
}
135135

136-
#[cfg(not(bootstrap))]
137136
#[unstable(feature = "map_try_insert", issue = "82766")]
138137
impl<'a, K: core::fmt::Debug + Ord, V: core::fmt::Debug> core::error::Error
139138
for crate::collections::btree_map::OccupiedError<'a, K, V>

‎alloc/src/collections/mod.rs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,5 @@ trait SpecExtend<I: IntoIterator> {
153153
fn spec_extend(&mut self, iter: I);
154154
}
155155

156-
#[cfg(not(bootstrap))]
157156
#[stable(feature = "try_reserve", since = "1.57.0")]
158157
impl core::error::Error for TryReserveError {}

‎alloc/src/ffi/c_str.rs‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1122,7 +1122,6 @@ impl CStr {
11221122
}
11231123
}
11241124

1125-
#[cfg(not(bootstrap))]
11261125
#[stable(feature = "rust1", since = "1.0.0")]
11271126
impl core::error::Error for NulError {
11281127
#[allow(deprecated)]
@@ -1131,11 +1130,9 @@ impl core::error::Error for NulError {
11311130
}
11321131
}
11331132

1134-
#[cfg(not(bootstrap))]
11351133
#[stable(feature = "cstring_from_vec_with_nul", since = "1.58.0")]
11361134
impl core::error::Error for FromVecWithNulError {}
11371135

1138-
#[cfg(not(bootstrap))]
11391136
#[stable(feature = "cstring_into", since = "1.7.0")]
11401137
impl core::error::Error for IntoStringError {
11411138
#[allow(deprecated)]

‎alloc/src/lib.rs‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,8 @@
114114
#![feature(const_waker)]
115115
#![feature(cstr_from_bytes_until_nul)]
116116
#![feature(dispatch_from_dyn)]
117-
#![cfg_attr(not(bootstrap), feature(error_generic_member_access))]
118-
#![cfg_attr(not(bootstrap), feature(error_in_core))]
117+
#![feature(error_generic_member_access)]
118+
#![feature(error_in_core)]
119119
#![feature(exact_size_is_empty)]
120120
#![feature(extend_one)]
121121
#![feature(fmt_internals)]
@@ -132,7 +132,7 @@
132132
#![feature(nonnull_slice_from_raw_parts)]
133133
#![feature(pattern)]
134134
#![feature(pointer_byte_offsets)]
135-
#![cfg_attr(not(bootstrap), feature(provide_any))]
135+
#![feature(provide_any)]
136136
#![feature(ptr_internals)]
137137
#![feature(ptr_metadata)]
138138
#![feature(ptr_sub_ptr)]
@@ -173,7 +173,6 @@
173173
#![cfg_attr(not(test), feature(generator_trait))]
174174
#![feature(hashmap_internals)]
175175
#![feature(lang_items)]
176-
#![cfg_attr(bootstrap, feature(let_else))]
177176
#![feature(min_specialization)]
178177
#![feature(negative_impls)]
179178
#![feature(never_type)]

‎alloc/src/string.rs‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@
4444

4545
#[cfg(not(no_global_oom_handling))]
4646
use core::char::{decode_utf16, REPLACEMENT_CHARACTER};
47-
#[cfg(not(bootstrap))]
4847
use core::error::Error;
4948
use core::fmt;
5049
use core::hash;
@@ -1941,7 +1940,6 @@ impl fmt::Display for FromUtf16Error {
19411940
}
19421941
}
19431942

1944-
#[cfg(not(bootstrap))]
19451943
#[stable(feature = "rust1", since = "1.0.0")]
19461944
impl Error for FromUtf8Error {
19471945
#[allow(deprecated)]
@@ -1950,7 +1948,6 @@ impl Error for FromUtf8Error {
19501948
}
19511949
}
19521950

1953-
#[cfg(not(bootstrap))]
19541951
#[stable(feature = "rust1", since = "1.0.0")]
19551952
impl Error for FromUtf16Error {
19561953
#[allow(deprecated)]

‎alloc/src/sync.rs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2764,7 +2764,6 @@ fn data_offset_align(align: usize) -> usize {
27642764
layout.size() + layout.padding_needed_for(align)
27652765
}
27662766

2767-
#[cfg(not(bootstrap))]
27682767
#[stable(feature = "arc_error", since = "1.52.0")]
27692768
impl<T: core::error::Error + ?Sized> core::error::Error for Arc<T> {
27702769
#[allow(deprecated, deprecated_in_future)]

‎core/src/alloc/layout.rs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
// Your performance intuition is useless. Run perf.
66

77
use crate::cmp;
8-
#[cfg(not(bootstrap))]
98
use crate::error::Error;
109
use crate::fmt;
1110
use crate::mem::{self, ValidAlign};
@@ -463,7 +462,6 @@ pub type LayoutErr = LayoutError;
463462
#[derive(Clone, PartialEq, Eq, Debug)]
464463
pub struct LayoutError;
465464

466-
#[cfg(not(bootstrap))]
467465
#[stable(feature = "alloc_layout", since = "1.28.0")]
468466
impl Error for LayoutError {}
469467

‎core/src/alloc/mod.rs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ pub use self::layout::LayoutErr;
2121
#[stable(feature = "alloc_layout_error", since = "1.50.0")]
2222
pub use self::layout::LayoutError;
2323

24-
#[cfg(not(bootstrap))]
2524
use crate::error::Error;
2625
use crate::fmt;
2726
use crate::ptr::{self, NonNull};
@@ -34,7 +33,6 @@ use crate::ptr::{self, NonNull};
3433
#[derive(Copy, Clone, PartialEq, Eq, Debug)]
3534
pub struct AllocError;
3635

37-
#[cfg(not(bootstrap))]
3836
#[unstable(
3937
feature = "allocator_api",
4038
reason = "the precise API and guarantees it provides may be tweaked.",

0 commit comments

Comments
 (0)