Skip discriminant computation

Author: compiler-errors

Cargo.lock

@@ -1014,8 +1014,7 @@ dependencies = [
 [[package]]
 name = "derivative"
 version = "2.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b"
+source = "git+https://github.com/compiler-errors/rust-derivative.git?branch=eq#d1f5d08ebcec06f0acea2957efba632b7ddf8666"
 dependencies = [
  "proc-macro2",
  "quote",

compiler/rustc_type_ir/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2021"
 [dependencies]
 # tidy-alphabetical-start
 bitflags = "1.2.1"
-derivative = "2.2.0"
+derivative = { git = "https://github.com/compiler-errors/rust-derivative.git", branch = "eq" }
 rustc_data_structures = { path = "../rustc_data_structures" }
 rustc_index = { path = "../rustc_index" }
 rustc_macros = { path = "../rustc_macros" }

compiler/rustc_type_ir/src/const_kind.rs

@@ -19,7 +19,7 @@ use self::ConstKind::*;
     Ord(bound = ""),
     Ord = "feature_allow_slow_enum",
     Hash(bound = ""),
-    PartialEq(bound = ""),
+    PartialEq(skip_discriminant = "true", bound = ""),
     Eq(bound = "")
 )]
 pub enum ConstKind<I: Interner> {

compiler/rustc_type_ir/src/predicate_kind.rs

@@ -12,7 +12,12 @@ use crate::{TyDecoder, TyEncoder};
 /// A clause is something that can appear in where bounds or be inferred
 /// by implied bounds.
 #[derive(derivative::Derivative)]
-#[derivative(Clone(bound = ""), Hash(bound = ""), PartialEq(bound = ""), Eq(bound = ""))]
+#[derivative(
+    Clone(bound = ""),
+    Hash(bound = ""),
+    PartialEq(skip_discriminant = "true", bound = ""),
+    Eq(bound = "")
+)]
 pub enum ClauseKind<I: Interner> {
     /// Corresponds to `where Foo: Bar<A, B, C>`. `Foo` here would be
     /// the `Self` type of the trait reference and `A`, `B`, and `C`
@@ -202,7 +207,12 @@ where
 }
 
 #[derive(derivative::Derivative)]
-#[derivative(Clone(bound = ""), Hash(bound = ""), PartialEq(bound = ""), Eq(bound = ""))]
+#[derivative(
+    Clone(bound = ""),
+    Hash(bound = ""),
+    PartialEq(skip_discriminant = "true", bound = ""),
+    Eq(bound = "")
+)]
 pub enum PredicateKind<I: Interner> {
     /// Prove a clause
     Clause(ClauseKind<I>),

compiler/rustc_type_ir/src/ty_kind.rs

@@ -121,7 +121,7 @@ pub enum AliasKind {
     Ord(bound = ""),
     Ord = "feature_allow_slow_enum",
     Hash(bound = ""),
-    PartialEq(bound = ""),
+    PartialEq(skip_discriminant = "true", bound = ""),
     Eq(bound = "")
 )]
 pub enum TyKind<I: Interner> {

src/tools/tidy/src/extdeps.rs

@@ -4,7 +4,10 @@ use std::fs;
 use std::path::Path;
 
 /// List of allowed sources for packages.
-const ALLOWED_SOURCES: &[&str] = &["\"registry+https://github.com/rust-lang/crates.io-index\""];
+const ALLOWED_SOURCES: &[&str] = &[
+    "\"registry+https://github.com/rust-lang/crates.io-index\"",
+    "\"git+https://github.com/compiler-errors/rust-derivative.git?branch=eq#d1f5d08ebcec06f0acea2957efba632b7ddf8666\"",
+];
 
 /// Checks for external package sources. `root` is the path to the directory that contains the
 /// workspace `Cargo.toml`.