bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

update cfg(bootstrap)s

Browse source
This commit is contained in:
Pietro Albini 2023-12-22 11:14:11 +01:00
parent bcdaa0d194
commit f9f5840eb4
No known key found for this signature in database
GPG key ID: 3E06ABE80BAAF19C
17 changed files with 24 additions and 452 deletions
Download patch file Download diff file Expand all files Collapse all files

6
compiler/rustc_codegen_cranelift/src/lib.rs
View file

@ -1,6 +1,6 @@
#![cfg_attr(all(doc, not(bootstrap)), allow(internal_features))] #![cfg_attr(doc, allow(internal_features))]
#![cfg_attr(all(doc, not(bootstrap)), feature(rustdoc_internals))] #![cfg_attr(doc, feature(rustdoc_internals))]
#![cfg_attr(all(doc, not(bootstrap)), doc(rust_logo))] #![cfg_attr(doc, doc(rust_logo))]
#![feature(rustc_private)] #![feature(rustc_private)]
// Note: please avoid adding other feature gates where possible // Note: please avoid adding other feature gates where possible
#![warn(rust_2018_idioms)] #![warn(rust_2018_idioms)]

1
compiler/rustc_codegen_llvm/src/lib.rs
View file

@ -8,7 +8,6 @@
#![feature(rustdoc_internals)] #![feature(rustdoc_internals)]
#![doc(rust_logo)] #![doc(rust_logo)]
#![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")] #![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")]
#![cfg_attr(bootstrap, feature(c_str_literals))]
#![feature(exact_size_is_empty)] #![feature(exact_size_is_empty)]
#![feature(extern_types)] #![feature(extern_types)]
#![feature(hash_raw_entry)] #![feature(hash_raw_entry)]

144
compiler/rustc_data_structures/src/tagged_ptr/impl_tag.rs
View file

@ -81,150 +81,6 @@
/// E::A, /// E::A,
/// } /// }
/// ``` /// ```
#[cfg(bootstrap)]
#[macro_export]
macro_rules! impl_tag {
(
impl Tag for $Self:ty;
$(
$($path:ident)::* $( { $( $fields:tt )* })?,
)*
) => {
// Safety:
// `bits_for_tags` is called on the same `${index()}`-es as
// `into_usize` returns, thus `BITS` constant is correct.
unsafe impl $crate::tagged_ptr::Tag for $Self {
const BITS: u32 = $crate::tagged_ptr::bits_for_tags(&[
$(
${index()},
$( ${ignore(path)} )*
)*
]);
#[inline]
fn into_usize(self) -> usize {
// This forbids use of repeating patterns (`Enum::V`&`Enum::V`, etc)
// (or at least it should, see <https://github.com/rust-lang/rust/issues/110613>)
#[forbid(unreachable_patterns)]
match self {
// `match` is doing heavy lifting here, by requiring exhaustiveness
$(
$($path)::* $( { $( $fields )* } )? => ${index()},
)*
}
}
#[inline]
unsafe fn from_usize(tag: usize) -> Self {
match tag {
$(
${index()} => $($path)::* $( { $( $fields )* } )?,
)*
// Safety:
// `into_usize` only returns `${index()}` of the same
// repetition as we are filtering above, thus if this is
// reached, the safety contract of this function was
// already breached.
_ => unsafe {
debug_assert!(
false,
"invalid tag: {tag}\
(this is a bug in the caller of `from_usize`)"
);
std::hint::unreachable_unchecked()
},
}
}
}
};
}
/// Implements [`Tag`] for a given type.
///
/// You can use `impl_tag` on structs and enums.
/// You need to specify the type and all its possible values,
/// which can only be paths with optional fields.
///
/// [`Tag`]: crate::tagged_ptr::Tag
///
/// # Examples
///
/// Basic usage:
///
/// ```
/// #![feature(macro_metavar_expr)]
/// use rustc_data_structures::{impl_tag, tagged_ptr::Tag};
///
/// #[derive(Copy, Clone, PartialEq, Debug)]
/// enum SomeTag {
/// A,
/// B,
/// X { v: bool },
/// Y(bool, bool),
/// }
///
/// impl_tag! {
/// // The type for which the `Tag` will be implemented
/// impl Tag for SomeTag;
/// // You need to specify all possible tag values:
/// SomeTag::A, // 0
/// SomeTag::B, // 1
/// // For variants with fields, you need to specify the fields:
/// SomeTag::X { v: true }, // 2
/// SomeTag::X { v: false }, // 3
/// // For tuple variants use named syntax:
/// SomeTag::Y { 0: true, 1: true }, // 4
/// SomeTag::Y { 0: false, 1: true }, // 5
/// SomeTag::Y { 0: true, 1: false }, // 6
/// SomeTag::Y { 0: false, 1: false }, // 7
/// }
///
/// // Tag values are assigned in order:
/// assert_eq!(SomeTag::A.into_usize(), 0);
/// assert_eq!(SomeTag::X { v: false }.into_usize(), 3);
/// assert_eq!(SomeTag::Y(false, true).into_usize(), 5);
///
/// assert_eq!(unsafe { SomeTag::from_usize(1) }, SomeTag::B);
/// assert_eq!(unsafe { SomeTag::from_usize(2) }, SomeTag::X { v: true });
/// assert_eq!(unsafe { SomeTag::from_usize(7) }, SomeTag::Y(false, false));
/// ```
///
/// Structs are supported:
///
/// ```
/// #![feature(macro_metavar_expr)]
/// # use rustc_data_structures::impl_tag;
/// #[derive(Copy, Clone)]
/// struct Flags { a: bool, b: bool }
///
/// impl_tag! {
/// impl Tag for Flags;
/// Flags { a: true, b: true },
/// Flags { a: false, b: true },
/// Flags { a: true, b: false },
/// Flags { a: false, b: false },
/// }
/// ```
///
/// Not specifying all values results in a compile error:
///
/// ```compile_fail,E0004
/// #![feature(macro_metavar_expr)]
/// # use rustc_data_structures::impl_tag;
/// #[derive(Copy, Clone)]
/// enum E {
/// A,
/// B,
/// }
///
/// impl_tag! {
/// impl Tag for E;
/// E::A,
/// }
/// ```
#[cfg(not(bootstrap))]
#[macro_export] #[macro_export]
macro_rules! impl_tag { macro_rules! impl_tag {
( (

126
compiler/rustc_expand/src/expand.rs
View file

@ -41,132 +41,6 @@ use std::path::PathBuf;
use std::rc::Rc; use std::rc::Rc;
use std::{iter, mem}; use std::{iter, mem};
#[cfg(bootstrap)]
macro_rules! ast_fragments {
(
$($Kind:ident($AstTy:ty) {
$kind_name:expr;
$(one fn $mut_visit_ast:ident; fn $visit_ast:ident;)?
$(many fn $flat_map_ast_elt:ident; fn $visit_ast_elt:ident($($args:tt)*);)?
fn $make_ast:ident;
})*
) => {
/// A fragment of AST that can be produced by a single macro expansion.
/// Can also serve as an input and intermediate result for macro expansion operations.
pub enum AstFragment {
OptExpr(Option<P<ast::Expr>>),
MethodReceiverExpr(P<ast::Expr>),
$($Kind($AstTy),)*
}
/// "Discriminant" of an AST fragment.
#[derive(Copy, Clone, PartialEq, Eq)]
pub enum AstFragmentKind {
OptExpr,
MethodReceiverExpr,
$($Kind,)*
}
impl AstFragmentKind {
pub fn name(self) -> &'static str {
match self {
AstFragmentKind::OptExpr => "expression",
AstFragmentKind::MethodReceiverExpr => "expression",
$(AstFragmentKind::$Kind => $kind_name,)*
}
}
fn make_from<'a>(self, result: Box<dyn MacResult + 'a>) -> Option<AstFragment> {
match self {
AstFragmentKind::OptExpr =>
result.make_expr().map(Some).map(AstFragment::OptExpr),
AstFragmentKind::MethodReceiverExpr =>
result.make_expr().map(AstFragment::MethodReceiverExpr),
$(AstFragmentKind::$Kind => result.$make_ast().map(AstFragment::$Kind),)*
}
}
}
impl AstFragment {
pub fn add_placeholders(&mut self, placeholders: &[NodeId]) {
if placeholders.is_empty() {
return;
}
match self {
$($(AstFragment::$Kind(ast) => ast.extend(placeholders.iter().flat_map(|id| {
${ignore(flat_map_ast_elt)}
placeholder(AstFragmentKind::$Kind, *id, None).$make_ast()
})),)?)*
_ => panic!("unexpected AST fragment kind")
}
}
pub fn make_opt_expr(self) -> Option<P<ast::Expr>> {
match self {
AstFragment::OptExpr(expr) => expr,
_ => panic!("AstFragment::make_* called on the wrong kind of fragment"),
}
}
pub fn make_method_receiver_expr(self) -> P<ast::Expr> {
match self {
AstFragment::MethodReceiverExpr(expr) => expr,
_ => panic!("AstFragment::make_* called on the wrong kind of fragment"),
}
}
$(pub fn $make_ast(self) -> $AstTy {
match self {
AstFragment::$Kind(ast) => ast,
_ => panic!("AstFragment::make_* called on the wrong kind of fragment"),
}
})*
fn make_ast<T: InvocationCollectorNode>(self) -> T::OutputTy {
T::fragment_to_output(self)
}
pub fn mut_visit_with<F: MutVisitor>(&mut self, vis: &mut F) {
match self {
AstFragment::OptExpr(opt_expr) => {
visit_clobber(opt_expr, |opt_expr| {
if let Some(expr) = opt_expr {
vis.filter_map_expr(expr)
} else {
None
}
});
}
AstFragment::MethodReceiverExpr(expr) => vis.visit_method_receiver_expr(expr),
$($(AstFragment::$Kind(ast) => vis.$mut_visit_ast(ast),)?)*
$($(AstFragment::$Kind(ast) =>
ast.flat_map_in_place(|ast| vis.$flat_map_ast_elt(ast)),)?)*
}
}
pub fn visit_with<'a, V: Visitor<'a>>(&'a self, visitor: &mut V) {
match self {
AstFragment::OptExpr(Some(expr)) => visitor.visit_expr(expr),
AstFragment::OptExpr(None) => {}
AstFragment::MethodReceiverExpr(expr) => visitor.visit_method_receiver_expr(expr),
$($(AstFragment::$Kind(ast) => visitor.$visit_ast(ast),)?)*
$($(AstFragment::$Kind(ast) => for ast_elt in &ast[..] {
visitor.$visit_ast_elt(ast_elt, $($args)*);
})?)*
}
}
}
impl<'a> MacResult for crate::mbe::macro_rules::ParserAnyMacro<'a> {
$(fn $make_ast(self: Box<crate::mbe::macro_rules::ParserAnyMacro<'a>>)
-> Option<$AstTy> {
Some(self.make(AstFragmentKind::$Kind).$make_ast())
})*
}
}
}
#[cfg(not(bootstrap))]
macro_rules! ast_fragments { macro_rules! ast_fragments {
( (
$($Kind:ident($AstTy:ty) { $($Kind:ident($AstTy:ty) {

1
compiler/rustc_lint/src/lib.rs
View file

@ -39,7 +39,6 @@
#![feature(min_specialization)] #![feature(min_specialization)]
#![feature(never_type)] #![feature(never_type)]
#![feature(rustc_attrs)] #![feature(rustc_attrs)]
#![cfg_attr(bootstrap, feature(trait_upcasting))]
#![recursion_limit = "256"] #![recursion_limit = "256"]
#![deny(rustc::untranslatable_diagnostic)] #![deny(rustc::untranslatable_diagnostic)]
#![deny(rustc::diagnostic_outside_of_impl)] #![deny(rustc::diagnostic_outside_of_impl)]

1
compiler/rustc_middle/src/lib.rs
View file

@ -49,7 +49,6 @@
#![feature(associated_type_bounds)] #![feature(associated_type_bounds)]
#![feature(rustc_attrs)] #![feature(rustc_attrs)]
#![feature(control_flow_enum)] #![feature(control_flow_enum)]
#![cfg_attr(bootstrap, feature(trait_upcasting))]
#![feature(trusted_step)] #![feature(trusted_step)]
#![feature(try_blocks)] #![feature(try_blocks)]
#![feature(try_reserve_kind)] #![feature(try_reserve_kind)]

8
library/core/src/async_iter/async_iter.rs
View file

@ -13,7 +13,7 @@ use crate::task::{Context, Poll};
#[unstable(feature = "async_iterator", issue = "79024")] #[unstable(feature = "async_iterator", issue = "79024")]
#[must_use = "async iterators do nothing unless polled"] #[must_use = "async iterators do nothing unless polled"]
#[doc(alias = "Stream")] #[doc(alias = "Stream")]
#[cfg_attr(not(bootstrap), lang = "async_iterator")] #[lang = "async_iterator"]
pub trait AsyncIterator { pub trait AsyncIterator {
/// The type of items yielded by the async iterator. /// The type of items yielded by the async iterator.
type Item; type Item;
@ -116,7 +116,7 @@ impl<T> Poll<Option<T>> {
/// A helper function for internal desugaring -- produces `Ready(Some(t))`, /// A helper function for internal desugaring -- produces `Ready(Some(t))`,
/// which corresponds to the async iterator yielding a value. /// which corresponds to the async iterator yielding a value.
#[unstable(feature = "async_gen_internals", issue = "none")] #[unstable(feature = "async_gen_internals", issue = "none")]
#[cfg_attr(not(bootstrap), lang = "AsyncGenReady")] #[lang = "AsyncGenReady"]
pub fn async_gen_ready(t: T) -> Self { pub fn async_gen_ready(t: T) -> Self {
Poll::Ready(Some(t)) Poll::Ready(Some(t))
} }
@ -124,13 +124,13 @@ impl<T> Poll<Option<T>> {
/// A helper constant for internal desugaring -- produces `Pending`, /// A helper constant for internal desugaring -- produces `Pending`,
/// which corresponds to the async iterator pending on an `.await`. /// which corresponds to the async iterator pending on an `.await`.
#[unstable(feature = "async_gen_internals", issue = "none")] #[unstable(feature = "async_gen_internals", issue = "none")]
#[cfg_attr(not(bootstrap), lang = "AsyncGenPending")] #[lang = "AsyncGenPending"]
// FIXME(gen_blocks): This probably could be deduplicated. // FIXME(gen_blocks): This probably could be deduplicated.
pub const PENDING: Self = Poll::Pending; pub const PENDING: Self = Poll::Pending;
/// A helper constant for internal desugaring -- produces `Ready(None)`, /// A helper constant for internal desugaring -- produces `Ready(None)`,
/// which corresponds to the async iterator finishing its iteration. /// which corresponds to the async iterator finishing its iteration.
#[unstable(feature = "async_gen_internals", issue = "none")] #[unstable(feature = "async_gen_internals", issue = "none")]
#[cfg_attr(not(bootstrap), lang = "AsyncGenFinished")] #[lang = "AsyncGenFinished"]
pub const FINISHED: Self = Poll::Ready(None); pub const FINISHED: Self = Poll::Ready(None);
} }

16
library/core/src/cmp.rs
View file

@ -224,13 +224,13 @@ use self::Ordering::*;
append_const_msg append_const_msg
)] )]
#[rustc_diagnostic_item = "PartialEq"] #[rustc_diagnostic_item = "PartialEq"]
#[cfg_attr(not(bootstrap), const_trait)] #[const_trait]
pub trait PartialEq<Rhs: ?Sized = Self> { pub trait PartialEq<Rhs: ?Sized = Self> {
/// This method tests for `self` and `other` values to be equal, and is used /// This method tests for `self` and `other` values to be equal, and is used
/// by `==`. /// by `==`.
#[must_use] #[must_use]
#[stable(feature = "rust1", since = "1.0.0")] #[stable(feature = "rust1", since = "1.0.0")]
#[cfg_attr(not(bootstrap), rustc_diagnostic_item = "cmp_partialeq_eq")] #[rustc_diagnostic_item = "cmp_partialeq_eq"]
fn eq(&self, other: &Rhs) -> bool; fn eq(&self, other: &Rhs) -> bool;
/// This method tests for `!=`. The default implementation is almost always /// This method tests for `!=`. The default implementation is almost always
@ -238,7 +238,7 @@ pub trait PartialEq<Rhs: ?Sized = Self> {
#[inline] #[inline]
#[must_use] #[must_use]
#[stable(feature = "rust1", since = "1.0.0")] #[stable(feature = "rust1", since = "1.0.0")]
#[cfg_attr(not(bootstrap), rustc_diagnostic_item = "cmp_partialeq_ne")] #[rustc_diagnostic_item = "cmp_partialeq_ne"]
fn ne(&self, other: &Rhs) -> bool { fn ne(&self, other: &Rhs) -> bool {
!self.eq(other) !self.eq(other)
} }
@ -1416,18 +1416,8 @@ mod impls {
macro_rules! partial_eq_impl { macro_rules! partial_eq_impl {
($($t:ty)*) => ($( ($($t:ty)*) => ($(
#[stable(feature = "rust1", since = "1.0.0")]
#[cfg(bootstrap)]
impl PartialEq for $t {
#[inline]
fn eq(&self, other: &$t) -> bool { (*self) == (*other) }
#[inline]
fn ne(&self, other: &$t) -> bool { (*self) != (*other) }
}
#[stable(feature = "rust1", since = "1.0.0")] #[stable(feature = "rust1", since = "1.0.0")]
#[rustc_const_unstable(feature = "const_cmp", issue = "92391")] #[rustc_const_unstable(feature = "const_cmp", issue = "92391")]
#[cfg(not(bootstrap))]
impl const PartialEq for $t { impl const PartialEq for $t {
#[inline] #[inline]
fn eq(&self, other: &$t) -> bool { (*self) == (*other) } fn eq(&self, other: &$t) -> bool { (*self) == (*other) }

2
library/core/src/intrinsics/simd.rs
View file

@ -257,7 +257,6 @@ extern "platform-intrinsic" {
/// type). /// type).
/// ///
/// `mask` must only contain `0` or `!0` values. /// `mask` must only contain `0` or `!0` values.
#[cfg(not(bootstrap))]
pub fn simd_masked_load<V, U, T>(mask: V, ptr: U, val: T) -> T; pub fn simd_masked_load<V, U, T>(mask: V, ptr: U, val: T) -> T;
/// Write to a vector of pointers. /// Write to a vector of pointers.
@ -277,7 +276,6 @@ extern "platform-intrinsic" {
/// type). /// type).
/// ///
/// `mask` must only contain `0` or `!0` values. /// `mask` must only contain `0` or `!0` values.
#[cfg(not(bootstrap))]
pub fn simd_masked_store<V, U, T>(mask: V, ptr: U, val: T); pub fn simd_masked_store<V, U, T>(mask: V, ptr: U, val: T);
/// Add two simd vectors elementwise, with saturation. /// Add two simd vectors elementwise, with saturation.

12
library/core/src/ptr/const_ptr.rs
View file

@ -1772,7 +1772,7 @@ impl<T> *const [T] {
#[stable(feature = "rust1", since = "1.0.0")] #[stable(feature = "rust1", since = "1.0.0")]
impl<T: ?Sized> PartialEq for *const T { impl<T: ?Sized> PartialEq for *const T {
#[inline] #[inline]
#[cfg_attr(not(bootstrap), allow(ambiguous_wide_pointer_comparisons))] #[allow(ambiguous_wide_pointer_comparisons)]
fn eq(&self, other: &*const T) -> bool { fn eq(&self, other: &*const T) -> bool {
*self == *other *self == *other
} }
@ -1785,7 +1785,7 @@ impl<T: ?Sized> Eq for *const T {}
#[stable(feature = "rust1", since = "1.0.0")] #[stable(feature = "rust1", since = "1.0.0")]
impl<T: ?Sized> Ord for *const T { impl<T: ?Sized> Ord for *const T {
#[inline] #[inline]
#[cfg_attr(not(bootstrap), allow(ambiguous_wide_pointer_comparisons))] #[allow(ambiguous_wide_pointer_comparisons)]
fn cmp(&self, other: &*const T) -> Ordering { fn cmp(&self, other: &*const T) -> Ordering {
if self < other { if self < other {
Less Less
@ -1805,25 +1805,25 @@ impl<T: ?Sized> PartialOrd for *const T {
} }
#[inline] #[inline]
#[cfg_attr(not(bootstrap), allow(ambiguous_wide_pointer_comparisons))] #[allow(ambiguous_wide_pointer_comparisons)]
fn lt(&self, other: &*const T) -> bool { fn lt(&self, other: &*const T) -> bool {
*self < *other *self < *other
} }
#[inline] #[inline]
#[cfg_attr(not(bootstrap), allow(ambiguous_wide_pointer_comparisons))] #[allow(ambiguous_wide_pointer_comparisons)]
fn le(&self, other: &*const T) -> bool { fn le(&self, other: &*const T) -> bool {
*self <= *other *self <= *other
} }
#[inline] #[inline]
#[cfg_attr(not(bootstrap), allow(ambiguous_wide_pointer_comparisons))] #[allow(ambiguous_wide_pointer_comparisons)]
fn gt(&self, other: &*const T) -> bool { fn gt(&self, other: &*const T) -> bool {
*self > *other *self > *other
} }
#[inline] #[inline]
#[cfg_attr(not(bootstrap), allow(ambiguous_wide_pointer_comparisons))] #[allow(ambiguous_wide_pointer_comparisons)]
fn ge(&self, other: &*const T) -> bool { fn ge(&self, other: &*const T) -> bool {
*self >= *other *self >= *other
} }

2
library/core/src/ptr/mod.rs
View file

@ -1900,7 +1900,7 @@ pub(crate) const unsafe fn align_offset<T: Sized>(p: *const T, a: usize) -> usiz
#[inline(always)] #[inline(always)]
#[must_use = "pointer comparison produces a value"] #[must_use = "pointer comparison produces a value"]
#[rustc_diagnostic_item = "ptr_eq"] #[rustc_diagnostic_item = "ptr_eq"]
#[cfg_attr(not(bootstrap), allow(ambiguous_wide_pointer_comparisons))] // it's actually clear here #[allow(ambiguous_wide_pointer_comparisons)] // it's actually clear here
pub fn eq<T: ?Sized>(a: *const T, b: *const T) -> bool { pub fn eq<T: ?Sized>(a: *const T, b: *const T) -> bool {
a == b a == b
} }

12
library/core/src/ptr/mut_ptr.rs
View file

@ -2199,7 +2199,7 @@ impl<T> *mut [T] {
#[stable(feature = "rust1", since = "1.0.0")] #[stable(feature = "rust1", since = "1.0.0")]
impl<T: ?Sized> PartialEq for *mut T { impl<T: ?Sized> PartialEq for *mut T {
#[inline(always)] #[inline(always)]
#[cfg_attr(not(bootstrap), allow(ambiguous_wide_pointer_comparisons))] #[allow(ambiguous_wide_pointer_comparisons)]
fn eq(&self, other: &*mut T) -> bool { fn eq(&self, other: &*mut T) -> bool {
*self == *other *self == *other
} }
@ -2211,7 +2211,7 @@ impl<T: ?Sized> Eq for *mut T {}
#[stable(feature = "rust1", since = "1.0.0")] #[stable(feature = "rust1", since = "1.0.0")]
impl<T: ?Sized> Ord for *mut T { impl<T: ?Sized> Ord for *mut T {
#[inline] #[inline]
#[cfg_attr(not(bootstrap), allow(ambiguous_wide_pointer_comparisons))] #[allow(ambiguous_wide_pointer_comparisons)]
fn cmp(&self, other: &*mut T) -> Ordering { fn cmp(&self, other: &*mut T) -> Ordering {
if self < other { if self < other {
Less Less
@ -2231,25 +2231,25 @@ impl<T: ?Sized> PartialOrd for *mut T {
} }
#[inline(always)] #[inline(always)]
#[cfg_attr(not(bootstrap), allow(ambiguous_wide_pointer_comparisons))] #[allow(ambiguous_wide_pointer_comparisons)]
fn lt(&self, other: &*mut T) -> bool { fn lt(&self, other: &*mut T) -> bool {
*self < *other *self < *other
} }
#[inline(always)] #[inline(always)]
#[cfg_attr(not(bootstrap), allow(ambiguous_wide_pointer_comparisons))] #[allow(ambiguous_wide_pointer_comparisons)]
fn le(&self, other: &*mut T) -> bool { fn le(&self, other: &*mut T) -> bool {
*self <= *other *self <= *other
} }
#[inline(always)] #[inline(always)]
#[cfg_attr(not(bootstrap), allow(ambiguous_wide_pointer_comparisons))] #[allow(ambiguous_wide_pointer_comparisons)]
fn gt(&self, other: &*mut T) -> bool { fn gt(&self, other: &*mut T) -> bool {
*self > *other *self > *other
} }
#[inline(always)] #[inline(always)]
#[cfg_attr(not(bootstrap), allow(ambiguous_wide_pointer_comparisons))] #[allow(ambiguous_wide_pointer_comparisons)]
fn ge(&self, other: &*mut T) -> bool { fn ge(&self, other: &*mut T) -> bool {
*self >= *other *self >= *other
} }

2
library/core/src/ptr/non_null.rs
View file

@ -1791,7 +1791,7 @@ impl<T: ?Sized> Eq for NonNull<T> {}
#[stable(feature = "nonnull", since = "1.25.0")] #[stable(feature = "nonnull", since = "1.25.0")]
impl<T: ?Sized> PartialEq for NonNull<T> { impl<T: ?Sized> PartialEq for NonNull<T> {
#[inline] #[inline]
#[cfg_attr(not(bootstrap), allow(ambiguous_wide_pointer_comparisons))] #[allow(ambiguous_wide_pointer_comparisons)]
fn eq(&self, other: &Self) -> bool { fn eq(&self, other: &Self) -> bool {
self.as_ptr() == other.as_ptr() self.as_ptr() == other.as_ptr()
} }

140
library/core/src/tuple.rs
View file

@ -8,146 +8,6 @@ use crate::marker::{StructuralEq, StructuralPartialEq};
// //
// Also provides implementations for tuples with lesser arity. For example, tuple_impls!(A B C) // Also provides implementations for tuples with lesser arity. For example, tuple_impls!(A B C)
// will implement everything for (A, B, C), (A, B) and (A,). // will implement everything for (A, B, C), (A, B) and (A,).
#[cfg(bootstrap)]
macro_rules! tuple_impls {
// Stopping criteria (1-ary tuple)
($T:ident) => {
tuple_impls!(@impl $T);
};
// Running criteria (n-ary tuple, with n >= 2)
($T:ident $( $U:ident )+) => {
tuple_impls!($( $U )+);
tuple_impls!(@impl $T $( $U )+);
};
// "Private" internal implementation
(@impl $( $T:ident )+) => {
maybe_tuple_doc! {
$($T)+ @
#[stable(feature = "rust1", since = "1.0.0")]
impl<$($T: PartialEq),+> PartialEq for ($($T,)+)
where
last_type!($($T,)+): ?Sized
{
#[inline]
fn eq(&self, other: &($($T,)+)) -> bool {
$( ${ignore(T)} self.${index()} == other.${index()} )&&+
}
#[inline]
fn ne(&self, other: &($($T,)+)) -> bool {
$( ${ignore(T)} self.${index()} != other.${index()} )||+
}
}
}
maybe_tuple_doc! {
$($T)+ @
#[stable(feature = "rust1", since = "1.0.0")]
impl<$($T: Eq),+> Eq for ($($T,)+)
where
last_type!($($T,)+): ?Sized
{}
}
maybe_tuple_doc! {
$($T)+ @
#[unstable(feature = "structural_match", issue = "31434")]
impl<$($T: ConstParamTy),+> ConstParamTy for ($($T,)+) {}
}
maybe_tuple_doc! {
$($T)+ @
#[unstable(feature = "structural_match", issue = "31434")]
impl<$($T),+> StructuralPartialEq for ($($T,)+) {}
}
maybe_tuple_doc! {
$($T)+ @
#[unstable(feature = "structural_match", issue = "31434")]
impl<$($T),+> StructuralEq for ($($T,)+) {}
}
maybe_tuple_doc! {
$($T)+ @
#[stable(feature = "rust1", since = "1.0.0")]
impl<$($T: PartialOrd),+> PartialOrd for ($($T,)+)
where
last_type!($($T,)+): ?Sized
{
#[inline]
fn partial_cmp(&self, other: &($($T,)+)) -> Option<Ordering> {
lexical_partial_cmp!($( ${ignore(T)} self.${index()}, other.${index()} ),+)
}
#[inline]
fn lt(&self, other: &($($T,)+)) -> bool {
lexical_ord!(lt, Less, $( ${ignore(T)} self.${index()}, other.${index()} ),+)
}
#[inline]
fn le(&self, other: &($($T,)+)) -> bool {
lexical_ord!(le, Less, $( ${ignore(T)} self.${index()}, other.${index()} ),+)
}
#[inline]
fn ge(&self, other: &($($T,)+)) -> bool {
lexical_ord!(ge, Greater, $( ${ignore(T)} self.${index()}, other.${index()} ),+)
}
#[inline]
fn gt(&self, other: &($($T,)+)) -> bool {
lexical_ord!(gt, Greater, $( ${ignore(T)} self.${index()}, other.${index()} ),+)
}
}
}
maybe_tuple_doc! {
$($T)+ @
#[stable(feature = "rust1", since = "1.0.0")]
impl<$($T: Ord),+> Ord for ($($T,)+)
where
last_type!($($T,)+): ?Sized
{
#[inline]
fn cmp(&self, other: &($($T,)+)) -> Ordering {
lexical_cmp!($( ${ignore(T)} self.${index()}, other.${index()} ),+)
}
}
}
maybe_tuple_doc! {
$($T)+ @
#[stable(feature = "rust1", since = "1.0.0")]
impl<$($T: Default),+> Default for ($($T,)+) {
#[inline]
fn default() -> ($($T,)+) {
($($T::default(),)+)
}
}
}
#[stable(feature = "array_tuple_conv", since = "1.71.0")]
impl<T> From<[T; ${count(T)}]> for ($(${ignore(T)} T,)+) {
#[inline]
#[allow(non_snake_case)]
fn from(array: [T; ${count(T)}]) -> Self {
let [$($T,)+] = array;
($($T,)+)
}
}
#[stable(feature = "array_tuple_conv", since = "1.71.0")]
impl<T> From<($(${ignore(T)} T,)+)> for [T; ${count(T)}] {
#[inline]
#[allow(non_snake_case)]
fn from(tuple: ($(${ignore(T)} T,)+)) -> Self {
let ($($T,)+) = tuple;
[$($T,)+]
}
}
}
}
// Recursive macro for implementing n-ary tuple functions and operations
//
// Also provides implementations for tuples with lesser arity. For example, tuple_impls!(A B C)
// will implement everything for (A, B, C), (A, B) and (A,).
#[cfg(not(bootstrap))]
macro_rules! tuple_impls { macro_rules! tuple_impls {
// Stopping criteria (1-ary tuple) // Stopping criteria (1-ary tuple)
($T:ident) => { ($T:ident) => {

1
library/core/tests/lib.rs
View file

@ -111,7 +111,6 @@
#![feature(slice_flatten)] #![feature(slice_flatten)]
#![feature(error_generic_member_access)] #![feature(error_generic_member_access)]
#![feature(error_in_core)] #![feature(error_in_core)]
#![cfg_attr(bootstrap, feature(trait_upcasting))]
#![feature(utf8_chunks)] #![feature(utf8_chunks)]
#![feature(is_ascii_octdigit)] #![feature(is_ascii_octdigit)]
#![feature(get_many_mut)] #![feature(get_many_mut)]

1
library/std/src/lib.rs
View file

@ -308,7 +308,6 @@
// //
// Library features (core): // Library features (core):
// tidy-alphabetical-start // tidy-alphabetical-start
#![cfg_attr(bootstrap, feature(c_str_literals))]
#![feature(char_internals)] #![feature(char_internals)]
#![feature(core_intrinsics)] #![feature(core_intrinsics)]
#![feature(core_io_borrowed_buf)] #![feature(core_io_borrowed_buf)]

1
src/tools/miri/src/lib.rs
View file

@ -11,7 +11,6 @@
#![feature(round_ties_even)] #![feature(round_ties_even)]
#![feature(let_chains)] #![feature(let_chains)]
#![feature(lint_reasons)] #![feature(lint_reasons)]
#![cfg_attr(bootstrap, feature(trait_upcasting))]
// Configure clippy and other lints // Configure clippy and other lints
#![allow( #![allow(
clippy::collapsible_else_if, clippy::collapsible_else_if,