Skip to content

Commit f5c7895

Browse files
lnicolalnicola
committed
Stop using derivative in rustc_pattern_analysis
1 parent 8b6a431 commit f5c7895

File tree

7 files changed

+191
-26
lines changed

7 files changed

+191
-26
lines changed

‎Cargo.lock

-1
Original file line numberDiff line numberDiff line change
@@ -4342,7 +4342,6 @@ dependencies = [
43424342
name = "rustc_pattern_analysis"
43434343
version = "0.0.0"
43444344
dependencies = [
4345-
"derivative",
43464345
"rustc-hash",
43474346
"rustc_apfloat",
43484347
"rustc_arena",

‎compiler/rustc_pattern_analysis/Cargo.toml

-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ edition = "2021"
55

66
[dependencies]
77
# tidy-alphabetical-start
8-
derivative = "2.2.0"
98
rustc-hash = "1.1.0"
109
rustc_apfloat = "0.2.0"
1110
rustc_arena = { path = "../rustc_arena", optional = true }

‎compiler/rustc_pattern_analysis/src/constructor.rs

+96-2
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,7 @@
151151
use std::cmp::{self, max, min, Ordering};
152152
use std::fmt;
153153
use std::iter::once;
154+
use std::mem;
154155

155156
use smallvec::SmallVec;
156157

@@ -648,8 +649,6 @@ impl OpaqueId {
648649
/// `specialize_constructor` returns the list of fields corresponding to a pattern, given a
649650
/// constructor. `Constructor::apply` reconstructs the pattern from a pair of `Constructor` and
650651
/// `Fields`.
651-
#[derive(derivative::Derivative)]
652-
#[derivative(Debug(bound = ""), Clone(bound = ""), PartialEq(bound = ""))]
653652
pub enum Constructor<Cx: TypeCx> {
654653
/// Tuples and structs.
655654
Struct,
@@ -692,6 +691,101 @@ pub enum Constructor<Cx: TypeCx> {
692691
Missing,
693692
}
694693

694+
impl<Cx: TypeCx> Clone for Constructor<Cx> {
695+
fn clone(&self) -> Self {
696+
match self {
697+
Constructor::Struct => Constructor::Struct,
698+
Constructor::Variant(idx) => Constructor::Variant(idx.clone()),
699+
Constructor::Ref => Constructor::Ref,
700+
Constructor::Slice(slice) => Constructor::Slice(slice.clone()),
701+
Constructor::UnionField => Constructor::UnionField,
702+
Constructor::Bool(b) => Constructor::Bool(b.clone()),
703+
Constructor::IntRange(range) => Constructor::IntRange(range.clone()),
704+
Constructor::F32Range(lo, hi, end) => {
705+
Constructor::F32Range(lo.clone(), hi.clone(), end.clone())
706+
}
707+
Constructor::F64Range(lo, hi, end) => {
708+
Constructor::F64Range(lo.clone(), hi.clone(), end.clone())
709+
}
710+
Constructor::Str(value) => Constructor::Str(value.clone()),
711+
Constructor::Opaque(inner) => Constructor::Opaque(inner.clone()),
712+
Constructor::Or => Constructor::Or,
713+
Constructor::Wildcard => Constructor::Wildcard,
714+
Constructor::NonExhaustive => Constructor::NonExhaustive,
715+
Constructor::Hidden => Constructor::Hidden,
716+
Constructor::Missing => Constructor::Missing,
717+
}
718+
}
719+
}
720+
721+
impl<Cx: TypeCx> fmt::Debug for Constructor<Cx> {
722+
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
723+
match self {
724+
Constructor::Struct => f.debug_tuple("Struct").finish(),
725+
Constructor::Variant(idx) => f.debug_tuple("Variant").field(idx).finish(),
726+
Constructor::Ref => f.debug_tuple("Ref").finish(),
727+
Constructor::Slice(slice) => f.debug_tuple("Slice").field(slice).finish(),
728+
Constructor::UnionField => f.debug_tuple("UnionField").finish(),
729+
Constructor::Bool(b) => f.debug_tuple("Bool").field(b).finish(),
730+
Constructor::IntRange(range) => f.debug_tuple("IntRange").field(range).finish(),
731+
Constructor::F32Range(lo, hi, end) => {
732+
f.debug_tuple("F32Range").field(lo).field(hi).field(end).finish()
733+
}
734+
Constructor::F64Range(lo, hi, end) => {
735+
f.debug_tuple("F64Range").field(lo).field(hi).field(end).finish()
736+
}
737+
Constructor::Str(value) => f.debug_tuple("Str").field(value).finish(),
738+
Constructor::Opaque(inner) => f.debug_tuple("Opaque").field(inner).finish(),
739+
Constructor::Or => f.debug_tuple("Or").finish(),
740+
Constructor::Wildcard => f.debug_tuple("Wildcard").finish(),
741+
Constructor::NonExhaustive => f.debug_tuple("NonExhaustive").finish(),
742+
Constructor::Hidden => f.debug_tuple("Hidden").finish(),
743+
Constructor::Missing => f.debug_tuple("Missing").finish(),
744+
}
745+
}
746+
}
747+
748+
impl<Cx: TypeCx> PartialEq for Constructor<Cx> {
749+
fn eq(&self, other: &Self) -> bool {
750+
(mem::discriminant(self) == mem::discriminant(other))
751+
&& match (self, other) {
752+
(Constructor::Struct, Constructor::Struct) => true,
753+
(Constructor::Variant(self_variant), Constructor::Variant(other_variant)) => {
754+
self_variant == other_variant
755+
}
756+
(Constructor::Ref, Constructor::Ref) => true,
757+
(Constructor::Slice(self_slice), Constructor::Slice(other_slice)) => {
758+
self_slice == other_slice
759+
}
760+
(Constructor::UnionField, Constructor::UnionField) => true,
761+
(Constructor::Bool(self_b), Constructor::Bool(other_b)) => self_b == other_b,
762+
(Constructor::IntRange(self_range), Constructor::IntRange(other_range)) => {
763+
self_range == other_range
764+
}
765+
(
766+
Constructor::F32Range(self_lo, self_hi, self_end),
767+
Constructor::F32Range(other_lo, other_hi, other_end),
768+
) => self_lo == other_lo && self_hi == other_hi && self_end == other_end,
769+
(
770+
Constructor::F64Range(self_lo, self_hi, self_end),
771+
Constructor::F64Range(other_lo, other_hi, other_end),
772+
) => self_lo == other_lo && self_hi == other_hi && self_end == other_end,
773+
(Constructor::Str(self_value), Constructor::Str(other_value)) => {
774+
self_value == other_value
775+
}
776+
(Constructor::Opaque(self_inner), Constructor::Opaque(other_inner)) => {
777+
self_inner == other_inner
778+
}
779+
(Constructor::Or, Constructor::Or) => true,
780+
(Constructor::Wildcard, Constructor::Wildcard) => true,
781+
(Constructor::NonExhaustive, Constructor::NonExhaustive) => true,
782+
(Constructor::Hidden, Constructor::Hidden) => true,
783+
(Constructor::Missing, Constructor::Missing) => true,
784+
_ => unreachable!(),
785+
}
786+
}
787+
}
788+
695789
impl<Cx: TypeCx> Constructor<Cx> {
696790
pub(crate) fn is_non_exhaustive(&self) -> bool {
697791
matches!(self, NonExhaustive)

‎compiler/rustc_pattern_analysis/src/lib.rs

+16-4
Original file line numberDiff line numberDiff line change
@@ -136,23 +136,35 @@ pub trait TypeCx: Sized + fmt::Debug {
136136
}
137137

138138
/// Context that provides information global to a match.
139-
#[derive(derivative::Derivative)]
140-
#[derivative(Clone(bound = ""), Copy(bound = ""))]
141139
pub struct MatchCtxt<'a, Cx: TypeCx> {
142140
/// The context for type information.
143141
pub tycx: &'a Cx,
144142
}
145143

144+
impl<'a, Cx: TypeCx> Clone for MatchCtxt<'a, Cx> {
145+
fn clone(&self) -> Self {
146+
Self { tycx: self.tycx }
147+
}
148+
}
149+
150+
impl<'a, Cx: TypeCx> Copy for MatchCtxt<'a, Cx> {}
151+
146152
/// The arm of a match expression.
147153
#[derive(Debug)]
148-
#[derive(derivative::Derivative)]
149-
#[derivative(Clone(bound = ""), Copy(bound = ""))]
150154
pub struct MatchArm<'p, Cx: TypeCx> {
151155
pub pat: &'p DeconstructedPat<'p, Cx>,
152156
pub has_guard: bool,
153157
pub arm_data: Cx::ArmData,
154158
}
155159

160+
impl<'p, Cx: TypeCx> Clone for MatchArm<'p, Cx> {
161+
fn clone(&self) -> Self {
162+
Self { pat: self.pat, has_guard: self.has_guard, arm_data: self.arm_data }
163+
}
164+
}
165+
166+
impl<'p, Cx: TypeCx> Copy for MatchArm<'p, Cx> {}
167+
156168
/// The entrypoint for this crate. Computes whether a match is exhaustive and which of its arms are
157169
/// useful, and runs some lints.
158170
#[cfg(feature = "rustc")]

‎compiler/rustc_pattern_analysis/src/pat.rs

+27-4
Original file line numberDiff line numberDiff line change
@@ -218,15 +218,24 @@ impl<'p, Cx: TypeCx> fmt::Debug for DeconstructedPat<'p, Cx> {
218218
/// algorithm. Do not use `Wild` to represent a wildcard pattern comping from user input.
219219
///
220220
/// This is morally `Option<&'p DeconstructedPat>` where `None` is interpreted as a wildcard.
221-
#[derive(derivative::Derivative)]
222-
#[derivative(Clone(bound = ""), Copy(bound = ""))]
223221
pub(crate) enum PatOrWild<'p, Cx: TypeCx> {
224222
/// A non-user-provided wildcard, created during specialization.
225223
Wild,
226224
/// A user-provided pattern.
227225
Pat(&'p DeconstructedPat<'p, Cx>),
228226
}
229227

228+
impl<'p, Cx: TypeCx> Clone for PatOrWild<'p, Cx> {
229+
fn clone(&self) -> Self {
230+
match self {
231+
PatOrWild::Wild => PatOrWild::Wild,
232+
PatOrWild::Pat(pat) => PatOrWild::Pat(pat),
233+
}
234+
}
235+
}
236+
237+
impl<'p, Cx: TypeCx> Copy for PatOrWild<'p, Cx> {}
238+
230239
impl<'p, Cx: TypeCx> PatOrWild<'p, Cx> {
231240
pub(crate) fn as_pat(&self) -> Option<&'p DeconstructedPat<'p, Cx>> {
232241
match self {
@@ -289,14 +298,28 @@ impl<'p, Cx: TypeCx> fmt::Debug for PatOrWild<'p, Cx> {
289298

290299
/// Same idea as `DeconstructedPat`, except this is a fictitious pattern built up for diagnostics
291300
/// purposes. As such they don't use interning and can be cloned.
292-
#[derive(derivative::Derivative)]
293-
#[derivative(Debug(bound = ""), Clone(bound = ""))]
294301
pub struct WitnessPat<Cx: TypeCx> {
295302
ctor: Constructor<Cx>,
296303
pub(crate) fields: Vec<WitnessPat<Cx>>,
297304
ty: Cx::Ty,
298305
}
299306

307+
impl<Cx: TypeCx> Clone for WitnessPat<Cx> {
308+
fn clone(&self) -> Self {
309+
Self { ctor: self.ctor.clone(), fields: self.fields.clone(), ty: self.ty.clone() }
310+
}
311+
}
312+
313+
impl<Cx: TypeCx> fmt::Debug for WitnessPat<Cx> {
314+
fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
315+
fmt.debug_struct("WitnessPat")
316+
.field("ctor", &self.ctor)
317+
.field("fields", &self.fields)
318+
.field("ty", &self.ty)
319+
.finish()
320+
}
321+
}
322+
300323
impl<Cx: TypeCx> WitnessPat<Cx> {
301324
pub(crate) fn new(ctor: Constructor<Cx>, fields: Vec<Self>, ty: Cx::Ty) -> Self {
302325
Self { ctor, fields, ty }

‎compiler/rustc_pattern_analysis/src/rustc.rs

+6-2
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,15 @@ pub type WitnessPat<'p, 'tcx> = crate::pat::WitnessPat<RustcMatchCheckCtxt<'p, '
4646
///
4747
/// Use `.inner()` or deref to get to the `Ty<'tcx>`.
4848
#[repr(transparent)]
49-
#[derive(derivative::Derivative)]
5049
#[derive(Clone, Copy)]
51-
#[derivative(Debug = "transparent")]
5250
pub struct RevealedTy<'tcx>(Ty<'tcx>);
5351

52+
impl<'tcx> fmt::Debug for RevealedTy<'tcx> {
53+
fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
54+
self.0.fmt(fmt)
55+
}
56+
}
57+
5458
impl<'tcx> std::ops::Deref for RevealedTy<'tcx> {
5559
type Target = Ty<'tcx>;
5660
fn deref(&self) -> &Self::Target {

‎compiler/rustc_pattern_analysis/src/usefulness.rs

+46-12
Original file line numberDiff line numberDiff line change
@@ -731,16 +731,26 @@ pub fn ensure_sufficient_stack<R>(f: impl FnOnce() -> R) -> R {
731731
}
732732

733733
/// Context that provides information local to a place under investigation.
734-
#[derive(derivative::Derivative)]
735-
#[derivative(Debug(bound = ""), Clone(bound = ""), Copy(bound = ""))]
736734
pub(crate) struct PlaceCtxt<'a, Cx: TypeCx> {
737-
#[derivative(Debug = "ignore")]
738735
pub(crate) mcx: MatchCtxt<'a, Cx>,
739736
/// Type of the place under investigation.
740-
#[derivative(Clone(clone_with = "Clone::clone"))] // See rust-derivative#90
741737
pub(crate) ty: &'a Cx::Ty,
742738
}
743739

740+
impl<'a, Cx: TypeCx> Clone for PlaceCtxt<'a, Cx> {
741+
fn clone(&self) -> Self {
742+
Self { mcx: self.mcx, ty: self.ty }
743+
}
744+
}
745+
746+
impl<'a, Cx: TypeCx> Copy for PlaceCtxt<'a, Cx> {}
747+
748+
impl<'a, Cx: TypeCx> fmt::Debug for PlaceCtxt<'a, Cx> {
749+
fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
750+
fmt.debug_struct("PlaceCtxt").field("ty", self.ty).finish()
751+
}
752+
}
753+
744754
impl<'a, Cx: TypeCx> PlaceCtxt<'a, Cx> {
745755
/// A `PlaceCtxt` when code other than `is_useful` needs one.
746756
#[cfg_attr(not(feature = "rustc"), allow(dead_code))]
@@ -813,8 +823,6 @@ impl fmt::Display for ValidityConstraint {
813823
// The three lifetimes are:
814824
// - 'p coming from the input
815825
// - Cx global compilation context
816-
#[derive(derivative::Derivative)]
817-
#[derivative(Clone(bound = ""))]
818826
struct PatStack<'p, Cx: TypeCx> {
819827
// Rows of len 1 are very common, which is why `SmallVec[_; 2]` works well.
820828
pats: SmallVec<[PatOrWild<'p, Cx>; 2]>,
@@ -824,6 +832,12 @@ struct PatStack<'p, Cx: TypeCx> {
824832
relevant: bool,
825833
}
826834

835+
impl<'p, Cx: TypeCx> Clone for PatStack<'p, Cx> {
836+
fn clone(&self) -> Self {
837+
Self { pats: self.pats.clone(), relevant: self.relevant }
838+
}
839+
}
840+
827841
impl<'p, Cx: TypeCx> PatStack<'p, Cx> {
828842
fn from_pattern(pat: &'p DeconstructedPat<'p, Cx>) -> Self {
829843
PatStack { pats: smallvec![PatOrWild::Pat(pat)], relevant: true }
@@ -1184,10 +1198,20 @@ impl<'p, Cx: TypeCx> fmt::Debug for Matrix<'p, Cx> {
11841198
/// The final `Pair(Some(_), true)` is then the resulting witness.
11851199
///
11861200
/// See the top of the file for more detailed explanations and examples.
1187-
#[derive(derivative::Derivative)]
1188-
#[derivative(Debug(bound = ""), Clone(bound = ""))]
11891201
struct WitnessStack<Cx: TypeCx>(Vec<WitnessPat<Cx>>);
11901202

1203+
impl<Cx: TypeCx> Clone for WitnessStack<Cx> {
1204+
fn clone(&self) -> Self {
1205+
Self(self.0.clone())
1206+
}
1207+
}
1208+
1209+
impl<Cx: TypeCx> fmt::Debug for WitnessStack<Cx> {
1210+
fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
1211+
fmt.debug_tuple("WitnessStack").field(&self.0).finish()
1212+
}
1213+
}
1214+
11911215
impl<Cx: TypeCx> WitnessStack<Cx> {
11921216
/// Asserts that the witness contains a single pattern, and returns it.
11931217
fn single_pattern(self) -> WitnessPat<Cx> {
@@ -1232,18 +1256,28 @@ impl<Cx: TypeCx> WitnessStack<Cx> {
12321256
///
12331257
/// Just as the `Matrix` starts with a single column, by the end of the algorithm, this has a single
12341258
/// column, which contains the patterns that are missing for the match to be exhaustive.
1235-
#[derive(derivative::Derivative)]
1236-
#[derivative(Debug(bound = ""), Clone(bound = ""))]
12371259
struct WitnessMatrix<Cx: TypeCx>(Vec<WitnessStack<Cx>>);
12381260

1261+
impl<Cx: TypeCx> Clone for WitnessMatrix<Cx> {
1262+
fn clone(&self) -> Self {
1263+
Self(self.0.clone())
1264+
}
1265+
}
1266+
1267+
impl<Cx: TypeCx> fmt::Debug for WitnessMatrix<Cx> {
1268+
fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
1269+
fmt.debug_tuple("WitnessMatrix").field(&self.0).finish()
1270+
}
1271+
}
1272+
12391273
impl<Cx: TypeCx> WitnessMatrix<Cx> {
12401274
/// New matrix with no witnesses.
12411275
fn empty() -> Self {
1242-
WitnessMatrix(vec![])
1276+
WitnessMatrix(Vec::new())
12431277
}
12441278
/// New matrix with one `()` witness, i.e. with no columns.
12451279
fn unit_witness() -> Self {
1246-
WitnessMatrix(vec![WitnessStack(vec![])])
1280+
WitnessMatrix(vec![WitnessStack(Vec::new())])
12471281
}
12481282

12491283
/// Whether this has any witnesses.

0 commit comments

Comments
 (0)