3 files changed, 22 insertions, 22 deletions
diff --git a/compiler/rustc_pattern_analysis/src/constructor.rs b/compiler/rustc_pattern_analysis/src/constructor.rs
index e9e873f14b9..716ccdd4dcd 100644
--- a/compiler/rustc_pattern_analysis/src/constructor.rs
+++ b/compiler/rustc_pattern_analysis/src/constructor.rs
@@ -1,18 +1,18 @@
-//! As explained in [`super::usefulness`], values and patterns are made from constructors applied to
+//! As explained in [`crate::usefulness`], values and patterns are made from constructors applied to
 //! fields. This file defines a `Constructor` enum and various operations to manipulate them.
 //!
 //! There are two important bits of core logic in this file: constructor inclusion and constructor
 //! splitting. Constructor inclusion, i.e. whether a constructor is included in/covered by another,
 //! is straightforward and defined in [`Constructor::is_covered_by`].
 //!
-//! Constructor splitting is mentioned in [`super::usefulness`] but not detailed. We describe it
+//! Constructor splitting is mentioned in [`crate::usefulness`] but not detailed. We describe it
 //! precisely here.
 //!
 //!
 //!
 //! # Constructor grouping and splitting
 //!
-//! As explained in the corresponding section in [`super::usefulness`], to make usefulness tractable
+//! As explained in the corresponding section in [`crate::usefulness`], to make usefulness tractable
 //! we need to group together constructors that have the same effect when they are used to
 //! specialize the matrix.
 //!
@@ -28,7 +28,7 @@
 //! In this example we can restrict specialization to 5 cases: `0..50`, `50..=100`, `101..=150`,
 //! `151..=200` and `200..`.
 //!
-//! In [`super::usefulness`], we had said that `specialize` only takes value-only constructors. We
+//! In [`crate::usefulness`], we had said that `specialize` only takes value-only constructors. We
 //! now relax this restriction: we allow `specialize` to take constructors like `0..50` as long as
 //! we're careful to only do that with constructors that make sense. For example, `specialize(0..50,
 //! (0..=100, true))` is sensible, but `specialize(50..=200, (0..=100, true))` is not.
@@ -40,9 +40,9 @@
 //! - That have no non-trivial intersection with any of the constructors in the column (i.e. they're
 //!     each either disjoint with or covered by any given column constructor).
 //!
-//! We compute this in two steps: first [`ConstructorSet::for_ty`] determines the set of all
-//! possible constructors for the type. Then [`ConstructorSet::split`] looks at the column of
-//! constructors and splits the set into groups accordingly. The precise invariants of
+//! We compute this in two steps: first [`crate::cx::MatchCheckCtxt::ctors_for_ty`] determines the
+//! set of all possible constructors for the type. Then [`ConstructorSet::split`] looks at the
+//! column of constructors and splits the set into groups accordingly. The precise invariants of
 //! [`ConstructorSet::split`] is described in [`SplitConstructorSet`].
 //!
 //! Constructor splitting has two interesting special cases: integer range splitting (see
@@ -71,10 +71,10 @@
 //! `Wildcard`.
 //!
 //! The only place where we care about which constructors `Missing` represents is in diagnostics
-//! (see `super::usefulness::WitnessMatrix::apply_constructor`).
+//! (see `crate::usefulness::WitnessMatrix::apply_constructor`).
 //!
 //! We choose whether to specialize with `Missing` in
-//! `super::usefulness::compute_exhaustiveness_and_reachability`.
+//! `crate::usefulness::compute_exhaustiveness_and_usefulness`.
 //!
 //!
 //!
@@ -88,7 +88,7 @@
 //! `exhaustive_patterns` feature is turned on, in which case we do treat them as empty. And also
 //! except if the type has no constructors (like `enum Void {}` but not like `Result<!, !>`), we
 //! specifically allow `match void {}` to be exhaustive. There are additionally considerations of
-//! place validity that are handled in `super::usefulness`. Yes this is a bit tricky.
+//! place validity that are handled in `crate::usefulness`. Yes this is a bit tricky.
 //!
 //! The second thing is that regardless of the above, it is always allowed to use all the
 //! constructors of a type. For example, all the following is ok:
@@ -136,8 +136,8 @@
 //! the algorithm can't distinguish them from a nonempty constructor. The only known case where this
 //! could happen is the `[..]` pattern on `[!; N]` with `N > 0` so we must take care to not emit it.
 //!
-//! This is all handled by [`ConstructorSet::for_ty`] and [`ConstructorSet::split`]. The invariants
-//! of [`SplitConstructorSet`] are also of interest.
+//! This is all handled by [`crate::cx::MatchCheckCtxt::ctors_for_ty`] and
+//! [`ConstructorSet::split`]. The invariants of [`SplitConstructorSet`] are also of interest.
 //!
 //!
 //!
diff --git a/compiler/rustc_pattern_analysis/src/lints.rs b/compiler/rustc_pattern_analysis/src/lints.rs
index 130945870e4..8ab559c9e7a 100644
--- a/compiler/rustc_pattern_analysis/src/lints.rs
+++ b/compiler/rustc_pattern_analysis/src/lints.rs
@@ -18,11 +18,10 @@ use crate::MatchArm;
 
 /// A column of patterns in the matrix, where a column is the intuitive notion of "subpatterns that
 /// inspect the same subvalue/place".
-/// This is used to traverse patterns column-by-column for lints. Despite similarities with
-/// [`compute_exhaustiveness_and_usefulness`], this does a different traversal. Notably this is
-/// linear in the depth of patterns, whereas `compute_exhaustiveness_and_usefulness` is worst-case
-/// exponential (exhaustiveness is NP-complete). The core difference is that we treat sub-columns
-/// separately.
+/// This is used to traverse patterns column-by-column for lints. Despite similarities with the
+/// algorithm in [`crate::usefulness`], this does a different traversal. Notably this is linear in
+/// the depth of patterns, whereas `compute_exhaustiveness_and_usefulness` is worst-case exponential
+/// (exhaustiveness is NP-complete). The core difference is that we treat sub-columns separately.
 ///
 /// This must not contain an or-pattern. `specialize` takes care to expand them.
 ///
diff --git a/compiler/rustc_pattern_analysis/src/usefulness.rs b/compiler/rustc_pattern_analysis/src/usefulness.rs
index 1c3de8803d3..f268a551547 100644
--- a/compiler/rustc_pattern_analysis/src/usefulness.rs
+++ b/compiler/rustc_pattern_analysis/src/usefulness.rs
@@ -97,8 +97,9 @@
 //! - `matches!([v0], [p0, .., p1]) := false` (incompatible lengths)
 //! - `matches!([v0, v1, v2], [p0, .., p1]) := matches!(v0, p0) && matches!(v2, p1)`
 //!
-//! Constructors, fields and relevant operations are defined in the [`super::deconstruct_pat`]
-//! module. The question of whether a constructor is matched by another one is answered by
+//! Constructors and relevant operations are defined in the [`crate::constructor`] module. A
+//! representation of patterns that uses constructors is available in [`crate::pat`]. The question
+//! of whether a constructor is matched by another one is answered by
 //! [`Constructor::is_covered_by`].
 //!
 //! Note 1: variable bindings (like the `x` in `Some(x)`) match anything, so we treat them as wildcards.
@@ -241,8 +242,8 @@
 //! Therefore `usefulness(tp_1, tp_2, tq)` returns the single witness-tuple `[Variant2(Some(true), 0)]`.
 //!
 //!
-//! Computing the set of constructors for a type is done in [`ConstructorSet::for_ty`]. See the
-//! following sections for more accurate versions of the algorithm and corresponding links.
+//! Computing the set of constructors for a type is done in [`MatchCheckCtxt::ctors_for_ty`]. See
+//! the following sections for more accurate versions of the algorithm and corresponding links.
 //!
 //!
 //!
@@ -295,7 +296,7 @@
 //! the same reasoning, we only need to try two cases: `North`, and "everything else".
 //!
 //! We call _constructor splitting_ the operation that computes such a minimal set of cases to try.
-//! This is done in [`ConstructorSet::split`] and explained in [`super::deconstruct_pat`].
+//! This is done in [`ConstructorSet::split`] and explained in [`crate::constructor`].
 //!
 //!
 //!