update cfg(bootstrap)s

Signed-off-by: onur-ozkan <[email protected]>

Author: onur-ozkan

compiler/rustc_lint/src/lib.rs

@@ -21,7 +21,6 @@
 
 // tidy-alphabetical-start
 #![allow(internal_features)]
-#![cfg_attr(bootstrap, feature(extract_if))]
 #![cfg_attr(doc, recursion_limit = "256")] // FIXME(nnethercote): will be removed by #124141
 #![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")]
 #![doc(rust_logo)]

compiler/rustc_metadata/src/lib.rs

@@ -1,6 +1,5 @@
 // tidy-alphabetical-start
 #![allow(internal_features)]
-#![cfg_attr(bootstrap, feature(extract_if))]
 #![cfg_attr(doc, recursion_limit = "256")] // FIXME(nnethercote): will be removed by #124141
 #![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")]
 #![doc(rust_logo)]

compiler/rustc_middle/src/lib.rs

@@ -29,7 +29,6 @@
 #![allow(rustc::diagnostic_outside_of_impl)]
 #![allow(rustc::potential_query_instability)]
 #![allow(rustc::untranslatable_diagnostic)]
-#![cfg_attr(bootstrap, feature(extract_if))]
 #![cfg_attr(doc, recursion_limit = "256")] // FIXME(nnethercote): will be removed by #124141
 #![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")]
 #![doc(rust_logo)]

compiler/rustc_resolve/src/lib.rs

@@ -10,7 +10,6 @@
 #![allow(internal_features)]
 #![allow(rustc::diagnostic_outside_of_impl)]
 #![allow(rustc::untranslatable_diagnostic)]
-#![cfg_attr(bootstrap, feature(extract_if))]
 #![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")]
 #![doc(rust_logo)]
 #![feature(assert_matches)]

compiler/rustc_serialize/src/lib.rs

@@ -3,7 +3,6 @@
 // tidy-alphabetical-start
 #![allow(internal_features)]
 #![allow(rustc::internal)]
-#![cfg_attr(bootstrap, feature(ptr_sub_ptr))]
 #![cfg_attr(test, feature(test))]
 #![doc(
     html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/",

compiler/rustc_serialize/src/opaque.rs

@@ -280,27 +280,13 @@ impl<'a> MemDecoder<'a> {
     #[inline]
     pub fn len(&self) -> usize {
         // SAFETY: This recovers the length of the original slice, only using members we never modify.
-        #[cfg(bootstrap)]
-        unsafe {
-            return self.end.sub_ptr(self.start);
-        }
-        #[cfg(not(bootstrap))]
-        unsafe {
-            self.end.offset_from_unsigned(self.start)
-        }
+        unsafe { self.end.offset_from_unsigned(self.start) }
     }
 
     #[inline]
     pub fn remaining(&self) -> usize {
         // SAFETY: This type guarantees current <= end.
-        #[cfg(bootstrap)]
-        unsafe {
-            return self.end.sub_ptr(self.current);
-        }
-        #[cfg(not(bootstrap))]
-        unsafe {
-            self.end.offset_from_unsigned(self.current)
-        }
+        unsafe { self.end.offset_from_unsigned(self.current) }
     }
 
     #[cold]
@@ -414,14 +400,7 @@ impl<'a> Decoder for MemDecoder<'a> {
     #[inline]
     fn position(&self) -> usize {
         // SAFETY: This type guarantees start <= current
-        #[cfg(bootstrap)]
-        unsafe {
-            return self.current.sub_ptr(self.start);
-        }
-        #[cfg(not(bootstrap))]
-        unsafe {
-            self.current.offset_from_unsigned(self.start)
-        }
+        unsafe { self.current.offset_from_unsigned(self.start) }
     }
 }
 

compiler/rustc_span/src/analyze_source_file.rs

@@ -83,30 +83,18 @@ cfg_match! {
 
                 // For character in the chunk, see if its byte value is < 0, which
                 // indicates that it's part of a UTF-8 char.
-                #[cfg(bootstrap)]
-                let multibyte_test = unsafe { _mm_cmplt_epi8(chunk, _mm_set1_epi8(0)) };
-                #[cfg(not(bootstrap))]
                 let multibyte_test = _mm_cmplt_epi8(chunk, _mm_set1_epi8(0));
 
                 // Create a bit mask from the comparison results.
-                #[cfg(bootstrap)]
-                let multibyte_mask = unsafe { _mm_movemask_epi8(multibyte_test) };
-                #[cfg(not(bootstrap))]
                 let multibyte_mask = _mm_movemask_epi8(multibyte_test);
 
                 // If the bit mask is all zero, we only have ASCII chars here:
                 if multibyte_mask == 0 {
                     assert!(intra_chunk_offset == 0);
 
                     // Check for newlines in the chunk
-                    #[cfg(bootstrap)]
-                    let newlines_test = unsafe { _mm_cmpeq_epi8(chunk, _mm_set1_epi8(b'\n' as i8)) };
-                    #[cfg(not(bootstrap))]
                     let newlines_test = _mm_cmpeq_epi8(chunk, _mm_set1_epi8(b'\n' as i8));
 
-                    #[cfg(bootstrap)]
-                    let mut newlines_mask = unsafe { _mm_movemask_epi8(newlines_test) };
-                    #[cfg(not(bootstrap))]
                     let mut newlines_mask = _mm_movemask_epi8(newlines_test);
 
                     let output_offset = RelativeBytePos::from_usize(chunk_index * CHUNK_SIZE + 1);

compiler/rustc_trait_selection/src/lib.rs

@@ -14,7 +14,6 @@
 #![allow(internal_features)]
 #![allow(rustc::diagnostic_outside_of_impl)]
 #![allow(rustc::untranslatable_diagnostic)]
-#![cfg_attr(bootstrap, feature(extract_if))]
 #![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")]
 #![doc(rust_logo)]
 #![feature(assert_matches)]

src/tools/miri/src/lib.rs

@@ -1,5 +1,3 @@
-#![cfg_attr(bootstrap, feature(extract_if))]
-#![cfg_attr(bootstrap, feature(unsigned_is_multiple_of))]
 #![feature(rustc_private)]
 #![feature(cfg_match)]
 #![feature(cell_update)]