squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Rollup merge of #93041 - pierwill:rm-unused-defid-ords, r=cjgillot

Browse source 
Remove some unused ordering derivations based on `DefId`

Like #93018, this removes some unused/unneeded ordering derivations as part of ongoing work on #90317. Here, these changes are aimed at making https://github.com/rust-lang/rust/pull/90749 easier to review, test, and merge.

r? `@cjgillot`
This commit is contained in:
Matthias Krüger 2022-01-19 10:42:19 +01:00 committed by GitHub
commit 0b9056c38a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
compiler/rustc_middle/src/mir/mod.rs
View file

@ -162,7 +162,7 @@ impl MirPhase {
} }
/// Where a specific `mir::Body` comes from. /// Where a specific `mir::Body` comes from.
#[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord)] #[derive(Copy, Clone, Debug, PartialEq, Eq)]
#[derive(HashStable, TyEncodable, TyDecodable, TypeFoldable)] #[derive(HashStable, TyEncodable, TyDecodable, TypeFoldable)]
pub struct MirSource<'tcx> { pub struct MirSource<'tcx> {
pub instance: InstanceDef<'tcx>, pub instance: InstanceDef<'tcx>,
@ -1255,17 +1255,7 @@ pub enum AssertKind<O> {
ResumedAfterPanic(GeneratorKind), ResumedAfterPanic(GeneratorKind),
} }
#[derive( #[derive(Clone, Debug, PartialEq, TyEncodable, TyDecodable, Hash, HashStable, TypeFoldable)]
Clone,
Debug,
PartialEq,
PartialOrd,
TyEncodable,
TyDecodable,
Hash,
HashStable,
TypeFoldable
)]
pub enum InlineAsmOperand<'tcx> { pub enum InlineAsmOperand<'tcx> {
In { In {
reg: InlineAsmRegOrRegClass, reg: InlineAsmRegOrRegClass,
@ -1747,7 +1737,7 @@ pub struct CopyNonOverlapping<'tcx> {
/// A path to a value; something that can be evaluated without /// A path to a value; something that can be evaluated without
/// changing or disturbing program state. /// changing or disturbing program state.
#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash, TyEncodable, HashStable)] #[derive(Copy, Clone, PartialEq, Eq, Hash, TyEncodable, HashStable)]
pub struct Place<'tcx> { pub struct Place<'tcx> {
pub local: Local, pub local: Local,
@ -2072,7 +2062,7 @@ pub struct SourceScopeLocalData {
/// These are values that can appear inside an rvalue. They are intentionally /// These are values that can appear inside an rvalue. They are intentionally
/// limited to prevent rvalues from being nested in one another. /// limited to prevent rvalues from being nested in one another.
#[derive(Clone, PartialEq, PartialOrd, TyEncodable, TyDecodable, Hash, HashStable)] #[derive(Clone, PartialEq, TyEncodable, TyDecodable, Hash, HashStable)]
pub enum Operand<'tcx> { pub enum Operand<'tcx> {
/// Copy: The value must be available for use afterwards. /// Copy: The value must be available for use afterwards.
/// ///
@ -2500,7 +2490,7 @@ impl<'tcx> Debug for Rvalue<'tcx> {
/// this does not necessarily mean that they are `==` in Rust. In /// this does not necessarily mean that they are `==` in Rust. In
/// particular, one must be wary of `NaN`! /// particular, one must be wary of `NaN`!
#[derive(Clone, Copy, PartialEq, PartialOrd, TyEncodable, TyDecodable, Hash, HashStable)] #[derive(Clone, Copy, PartialEq, TyEncodable, TyDecodable, Hash, HashStable)]
pub struct Constant<'tcx> { pub struct Constant<'tcx> {
pub span: Span, pub span: Span,
@ -2514,7 +2504,7 @@ pub struct Constant<'tcx> {
pub literal: ConstantKind<'tcx>, pub literal: ConstantKind<'tcx>,
} }
#[derive(Clone, Copy, PartialEq, Eq, PartialOrd, TyEncodable, TyDecodable, Hash, HashStable, Debug)] #[derive(Clone, Copy, PartialEq, Eq, TyEncodable, TyDecodable, Hash, HashStable, Debug)]
#[derive(Lift)] #[derive(Lift)]
pub enum ConstantKind<'tcx> { pub enum ConstantKind<'tcx> {
/// This constant came from the type system /// This constant came from the type system