Skip to content

Commit 8c50e3e

Browse files
compiler-errorscompiler-errors
authored
Rollup merge of #119230 - Nadrieril:librarify-even-further, r=compiler-errors
Exhaustiveness: clean up after librarification This cleans up some things that weren't done nicely by #118842. r? `@compiler-errors`
2 parents eef023c + 5fccaee commit 8c50e3e

File tree

10 files changed

+45
-41
lines changed

10 files changed

+45
-41
lines changed

‎Cargo.lock

+1
Original file line numberDiff line numberDiff line change
@@ -4340,6 +4340,7 @@ dependencies = [
43404340
name = "rustc_pattern_analysis"
43414341
version = "0.0.0"
43424342
dependencies = [
4343+
"derivative",
43434344
"rustc_apfloat",
43444345
"rustc_arena",
43454346
"rustc_data_structures",

‎compiler/rustc_index/src/bit_set.rs

+2
Original file line numberDiff line numberDiff line change
@@ -502,6 +502,7 @@ impl<T: Idx> ChunkedBitSet<T> {
502502
};
503503
#[cfg(not(feature = "nightly"))]
504504
let mut words = {
505+
// FIXME: unconditionally use `Rc::new_zeroed` once it is stable (#63291).
505506
let words = mem::MaybeUninit::<[Word; CHUNK_WORDS]>::zeroed();
506507
// SAFETY: `words` can safely be all zeroes.
507508
let words = unsafe { words.assume_init() };
@@ -567,6 +568,7 @@ impl<T: Idx> ChunkedBitSet<T> {
567568
};
568569
#[cfg(not(feature = "nightly"))]
569570
let mut words = {
571+
// FIXME: unconditionally use `Rc::new_zeroed` once it is stable (#63291).
570572
let words = mem::MaybeUninit::<[Word; CHUNK_WORDS]>::zeroed();
571573
// SAFETY: `words` can safely be all zeroes.
572574
let words = unsafe { words.assume_init() };

‎compiler/rustc_mir_build/src/thir/pattern/check_match.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -856,7 +856,7 @@ fn report_arm_reachability<'p, 'tcx>(
856856
for (arm, is_useful) in report.arm_usefulness.iter() {
857857
match is_useful {
858858
Usefulness::Redundant => {
859-
report_unreachable_pattern(*arm.pat.data(), arm.arm_data, catchall)
859+
report_unreachable_pattern(*arm.pat.data().unwrap(), arm.arm_data, catchall)
860860
}
861861
Usefulness::Useful(redundant_subpats) if redundant_subpats.is_empty() => {}
862862
// The arm is reachable, but contains redundant subpatterns (from or-patterns).
@@ -865,12 +865,12 @@ fn report_arm_reachability<'p, 'tcx>(
865865
// Emit lints in the order in which they occur in the file.
866866
redundant_subpats.sort_unstable_by_key(|pat| pat.data());
867867
for pat in redundant_subpats {
868-
report_unreachable_pattern(*pat.data(), arm.arm_data, None);
868+
report_unreachable_pattern(*pat.data().unwrap(), arm.arm_data, None);
869869
}
870870
}
871871
}
872872
if !arm.has_guard && catchall.is_none() && pat_is_catchall(arm.pat) {
873-
catchall = Some(*arm.pat.data());
873+
catchall = Some(*arm.pat.data().unwrap());
874874
}
875875
}
876876
}

‎compiler/rustc_pattern_analysis/Cargo.toml

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

66
[dependencies]
77
# tidy-alphabetical-start
8+
derivative = "2.2.0"
89
rustc_apfloat = "0.2.0"
910
rustc_arena = { path = "../rustc_arena", optional = true }
1011
rustc_data_structures = { path = "../rustc_data_structures", optional = true }

‎compiler/rustc_pattern_analysis/src/constructor.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -642,7 +642,8 @@ impl OpaqueId {
642642
/// `specialize_constructor` returns the list of fields corresponding to a pattern, given a
643643
/// constructor. `Constructor::apply` reconstructs the pattern from a pair of `Constructor` and
644644
/// `Fields`.
645-
#[derive(Clone, Debug, PartialEq)]
645+
#[derive(derivative::Derivative)]
646+
#[derivative(Debug(bound = ""), Clone(bound = ""), PartialEq(bound = ""))]
646647
pub enum Constructor<Cx: TypeCx> {
647648
/// Tuples and structs.
648649
Struct,

‎compiler/rustc_pattern_analysis/src/lib.rs

+8-10
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ impl<'a, T: ?Sized> Captures<'a> for T {}
4949
/// Context that provides type information about constructors.
5050
///
5151
/// Most of the crate is parameterized on a type that implements this trait.
52-
pub trait TypeCx: Sized + Clone + fmt::Debug {
52+
pub trait TypeCx: Sized + fmt::Debug {
5353
/// The type of a pattern.
5454
type Ty: Copy + Clone + fmt::Debug; // FIXME: remove Copy
5555
/// The index of an enum variant.
@@ -58,9 +58,8 @@ pub trait TypeCx: Sized + Clone + fmt::Debug {
5858
type StrLit: Clone + PartialEq + fmt::Debug;
5959
/// Extra data to store in a match arm.
6060
type ArmData: Copy + Clone + fmt::Debug;
61-
/// Extra data to store in a pattern. `Default` needed when we create fictitious wildcard
62-
/// patterns during analysis.
63-
type PatData: Clone + Default;
61+
/// Extra data to store in a pattern.
62+
type PatData: Clone;
6463

6564
/// FIXME(Nadrieril): `Cx` should only give us revealed types.
6665
fn reveal_opaque_ty(&self, ty: Self::Ty) -> Self::Ty;
@@ -86,26 +85,25 @@ pub trait TypeCx: Sized + Clone + fmt::Debug {
8685
}
8786

8887
/// Context that provides information global to a match.
89-
#[derive(Clone)]
88+
#[derive(derivative::Derivative)]
89+
#[derivative(Clone(bound = ""), Copy(bound = ""))]
9090
pub struct MatchCtxt<'a, 'p, Cx: TypeCx> {
9191
/// The context for type information.
9292
pub tycx: &'a Cx,
9393
/// An arena to store the wildcards we produce during analysis.
9494
pub wildcard_arena: &'a TypedArena<DeconstructedPat<'p, Cx>>,
9595
}
9696

97-
impl<'a, 'p, Cx: TypeCx> Copy for MatchCtxt<'a, 'p, Cx> {}
98-
9997
/// The arm of a match expression.
100-
#[derive(Clone, Debug)]
98+
#[derive(Debug)]
99+
#[derive(derivative::Derivative)]
100+
#[derivative(Clone(bound = ""), Copy(bound = ""))]
101101
pub struct MatchArm<'p, Cx: TypeCx> {
102102
pub pat: &'p DeconstructedPat<'p, Cx>,
103103
pub has_guard: bool,
104104
pub arm_data: Cx::ArmData,
105105
}
106106

107-
impl<'p, Cx: TypeCx> Copy for MatchArm<'p, Cx> {}
108-
109107
/// The entrypoint for this crate. Computes whether a match is exhaustive and which of its arms are
110108
/// useful, and runs some lints.
111109
#[cfg(feature = "rustc")]

‎compiler/rustc_pattern_analysis/src/lints.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ pub(crate) fn lint_nonexhaustive_missing_variants<'a, 'p, 'tcx>(
203203
};
204204

205205
use rustc_errors::DecorateLint;
206-
let mut err = rcx.tcx.sess.struct_span_warn(*arm.pat.data(), "");
206+
let mut err = rcx.tcx.sess.struct_span_warn(*arm.pat.data().unwrap(), "");
207207
err.set_primary_message(decorator.msg());
208208
decorator.decorate_lint(&mut err);
209209
err.emit();
@@ -253,8 +253,8 @@ pub(crate) fn lint_overlapping_range_endpoints<'a, 'p, 'tcx>(
253253
let mut suffixes: SmallVec<[_; 1]> = Default::default();
254254
// Iterate on patterns that contained `overlap`.
255255
for pat in column.iter() {
256-
let this_span = *pat.data();
257256
let Constructor::IntRange(this_range) = pat.ctor() else { continue };
257+
let this_span = *pat.data().unwrap();
258258
if this_range.is_singleton() {
259259
// Don't lint when one of the ranges is a singleton.
260260
continue;

‎compiler/rustc_pattern_analysis/src/pat.rs

+13-8
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,16 @@ pub struct DeconstructedPat<'p, Cx: TypeCx> {
2626
ctor: Constructor<Cx>,
2727
fields: &'p [DeconstructedPat<'p, Cx>],
2828
ty: Cx::Ty,
29-
data: Cx::PatData,
29+
/// Extra data to store in a pattern. `None` if the pattern is a wildcard that does not
30+
/// correspond to a user-supplied pattern.
31+
data: Option<Cx::PatData>,
3032
/// Whether removing this arm would change the behavior of the match expression.
3133
useful: Cell<bool>,
3234
}
3335

3436
impl<'p, Cx: TypeCx> DeconstructedPat<'p, Cx> {
35-
pub fn wildcard(ty: Cx::Ty, data: Cx::PatData) -> Self {
36-
Self::new(Wildcard, &[], ty, data)
37+
pub fn wildcard(ty: Cx::Ty) -> Self {
38+
DeconstructedPat { ctor: Wildcard, fields: &[], ty, data: None, useful: Cell::new(false) }
3739
}
3840

3941
pub fn new(
@@ -42,7 +44,7 @@ impl<'p, Cx: TypeCx> DeconstructedPat<'p, Cx> {
4244
ty: Cx::Ty,
4345
data: Cx::PatData,
4446
) -> Self {
45-
DeconstructedPat { ctor, fields, ty, data, useful: Cell::new(false) }
47+
DeconstructedPat { ctor, fields, ty, data: Some(data), useful: Cell::new(false) }
4648
}
4749

4850
pub(crate) fn is_or_pat(&self) -> bool {
@@ -63,8 +65,10 @@ impl<'p, Cx: TypeCx> DeconstructedPat<'p, Cx> {
6365
pub fn ty(&self) -> Cx::Ty {
6466
self.ty
6567
}
66-
pub fn data(&self) -> &Cx::PatData {
67-
&self.data
68+
/// Returns the extra data stored in a pattern. Returns `None` if the pattern is a wildcard that
69+
/// does not correspond to a user-supplied pattern.
70+
pub fn data(&self) -> Option<&Cx::PatData> {
71+
self.data.as_ref()
6872
}
6973

7074
pub fn iter_fields<'a>(
@@ -83,7 +87,7 @@ impl<'p, Cx: TypeCx> DeconstructedPat<'p, Cx> {
8387
let wildcard_sub_tys = || {
8488
let tys = pcx.ctor_sub_tys(other_ctor);
8589
tys.iter()
86-
.map(|ty| DeconstructedPat::wildcard(*ty, Cx::PatData::default()))
90+
.map(|ty| DeconstructedPat::wildcard(*ty))
8791
.map(|pat| pcx.mcx.wildcard_arena.alloc(pat) as &_)
8892
.collect()
8993
};
@@ -160,7 +164,8 @@ impl<'p, Cx: TypeCx> fmt::Debug for DeconstructedPat<'p, Cx> {
160164

161165
/// Same idea as `DeconstructedPat`, except this is a fictitious pattern built up for diagnostics
162166
/// purposes. As such they don't use interning and can be cloned.
163-
#[derive(Debug, Clone)]
167+
#[derive(derivative::Derivative)]
168+
#[derivative(Debug(bound = ""), Clone(bound = ""))]
164169
pub struct WitnessPat<Cx: TypeCx> {
165170
ctor: Constructor<Cx>,
166171
pub(crate) fields: Vec<WitnessPat<Cx>>,

‎compiler/rustc_pattern_analysis/src/rustc.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -416,7 +416,7 @@ impl<'p, 'tcx> RustcMatchCheckCtxt<'p, 'tcx> {
416416
ty::Tuple(fs) => {
417417
ctor = Struct;
418418
let mut wilds: SmallVec<[_; 2]> =
419-
fs.iter().map(|ty| DeconstructedPat::wildcard(ty, pat.span)).collect();
419+
fs.iter().map(|ty| DeconstructedPat::wildcard(ty)).collect();
420420
for pat in subpatterns {
421421
wilds[pat.field.index()] = self.lower_pat(&pat.pattern);
422422
}
@@ -439,7 +439,7 @@ impl<'p, 'tcx> RustcMatchCheckCtxt<'p, 'tcx> {
439439
let pat = if let Some(pat) = pattern {
440440
self.lower_pat(&pat.pattern)
441441
} else {
442-
DeconstructedPat::wildcard(args.type_at(0), pat.span)
442+
DeconstructedPat::wildcard(args.type_at(0))
443443
};
444444
ctor = Struct;
445445
fields = singleton(pat);
@@ -464,7 +464,7 @@ impl<'p, 'tcx> RustcMatchCheckCtxt<'p, 'tcx> {
464464
ty
465465
});
466466
let mut wilds: SmallVec<[_; 2]> =
467-
tys.map(|ty| DeconstructedPat::wildcard(ty, pat.span)).collect();
467+
tys.map(|ty| DeconstructedPat::wildcard(ty)).collect();
468468
for pat in subpatterns {
469469
if let Some(i) = field_id_to_id[pat.field.index()] {
470470
wilds[i] = self.lower_pat(&pat.pattern);

‎compiler/rustc_pattern_analysis/src/usefulness.rs

+10-14
Original file line numberDiff line numberDiff line change
@@ -569,8 +569,10 @@ pub fn ensure_sufficient_stack<R>(f: impl FnOnce() -> R) -> R {
569569
}
570570

571571
/// Context that provides information local to a place under investigation.
572-
#[derive(Clone)]
572+
#[derive(derivative::Derivative)]
573+
#[derivative(Debug(bound = ""), Clone(bound = ""), Copy(bound = ""))]
573574
pub(crate) struct PlaceCtxt<'a, 'p, Cx: TypeCx> {
575+
#[derivative(Debug = "ignore")]
574576
pub(crate) mcx: MatchCtxt<'a, 'p, Cx>,
575577
/// Type of the place under investigation.
576578
pub(crate) ty: Cx::Ty,
@@ -596,14 +598,6 @@ impl<'a, 'p, Cx: TypeCx> PlaceCtxt<'a, 'p, Cx> {
596598
}
597599
}
598600

599-
impl<'a, 'p, Cx: TypeCx> Copy for PlaceCtxt<'a, 'p, Cx> {}
600-
601-
impl<'a, 'p, Cx: TypeCx> fmt::Debug for PlaceCtxt<'a, 'p, Cx> {
602-
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
603-
f.debug_struct("PlaceCtxt").field("ty", &self.ty).finish()
604-
}
605-
}
606-
607601
/// Serves two purposes:
608602
/// - in a wildcard, tracks whether the wildcard matches only valid values (i.e. is a binding `_a`)
609603
/// or also invalid values (i.e. is a true `_` pattern).
@@ -670,7 +664,8 @@ impl fmt::Display for ValidityConstraint {
670664
// - 'a allocated by us
671665
// - 'p coming from the input
672666
// - Cx global compilation context
673-
#[derive(Clone)]
667+
#[derive(derivative::Derivative)]
668+
#[derivative(Clone(bound = ""))]
674669
struct PatStack<'a, 'p, Cx: TypeCx> {
675670
// Rows of len 1 are very common, which is why `SmallVec[_; 2]` works well.
676671
pats: SmallVec<[&'a DeconstructedPat<'p, Cx>; 2]>,
@@ -845,8 +840,7 @@ impl<'a, 'p, Cx: TypeCx> Matrix<'a, 'p, Cx> {
845840
scrut_ty: Cx::Ty,
846841
scrut_validity: ValidityConstraint,
847842
) -> Self {
848-
let wild_pattern =
849-
wildcard_arena.alloc(DeconstructedPat::wildcard(scrut_ty, Default::default()));
843+
let wild_pattern = wildcard_arena.alloc(DeconstructedPat::wildcard(scrut_ty));
850844
let wildcard_row = PatStack::from_pattern(wild_pattern);
851845
let mut matrix = Matrix {
852846
rows: Vec::with_capacity(arms.len()),
@@ -1022,7 +1016,8 @@ impl<'a, 'p, Cx: TypeCx> fmt::Debug for Matrix<'a, 'p, Cx> {
10221016
/// The final `Pair(Some(_), true)` is then the resulting witness.
10231017
///
10241018
/// See the top of the file for more detailed explanations and examples.
1025-
#[derive(Debug, Clone)]
1019+
#[derive(derivative::Derivative)]
1020+
#[derivative(Debug(bound = ""), Clone(bound = ""))]
10261021
struct WitnessStack<Cx: TypeCx>(Vec<WitnessPat<Cx>>);
10271022

10281023
impl<Cx: TypeCx> WitnessStack<Cx> {
@@ -1069,7 +1064,8 @@ impl<Cx: TypeCx> WitnessStack<Cx> {
10691064
///
10701065
/// Just as the `Matrix` starts with a single column, by the end of the algorithm, this has a single
10711066
/// column, which contains the patterns that are missing for the match to be exhaustive.
1072-
#[derive(Debug, Clone)]
1067+
#[derive(derivative::Derivative)]
1068+
#[derivative(Debug(bound = ""), Clone(bound = ""))]
10731069
struct WitnessMatrix<Cx: TypeCx>(Vec<WitnessStack<Cx>>);
10741070

10751071
impl<Cx: TypeCx> WitnessMatrix<Cx> {

0 commit comments

Comments
 (0)