Skip to content

Commit 74f5635

Browse files
committed
canonical: yeet EvalCtxt, mk Canonicalizer private
1 parent a6816aa commit 74f5635

File tree

3 files changed

+233
-211
lines changed

3 files changed

+233
-211
lines changed

compiler/rustc_next_trait_solver/src/canonical/canonicalizer.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ enum CanonicalizeMode {
5757
},
5858
}
5959

60-
pub struct Canonicalizer<'a, D: SolverDelegate<Interner = I>, I: Interner> {
60+
pub(super) struct Canonicalizer<'a, D: SolverDelegate<Interner = I>, I: Interner> {
6161
delegate: &'a D,
6262

6363
// Immutable field.
@@ -83,7 +83,7 @@ pub struct Canonicalizer<'a, D: SolverDelegate<Interner = I>, I: Interner> {
8383
}
8484

8585
impl<'a, D: SolverDelegate<Interner = I>, I: Interner> Canonicalizer<'a, D, I> {
86-
pub fn canonicalize_response<T: TypeFoldable<I>>(
86+
pub(super) fn canonicalize_response<T: TypeFoldable<I>>(
8787
delegate: &'a D,
8888
max_input_universe: ty::UniverseIndex,
8989
variables: &'a mut Vec<I::GenericArg>,
@@ -112,7 +112,6 @@ impl<'a, D: SolverDelegate<Interner = I>, I: Interner> Canonicalizer<'a, D, I> {
112112
let (max_universe, variables) = canonicalizer.finalize();
113113
Canonical { max_universe, variables, value }
114114
}
115-
116115
fn canonicalize_param_env(
117116
delegate: &'a D,
118117
variables: &'a mut Vec<I::GenericArg>,
@@ -195,7 +194,7 @@ impl<'a, D: SolverDelegate<Interner = I>, I: Interner> Canonicalizer<'a, D, I> {
195194
///
196195
/// We want to keep the option of canonicalizing `'static` to an existential
197196
/// variable in the future by changing the way we detect global where-bounds.
198-
pub fn canonicalize_input<P: TypeFoldable<I>>(
197+
pub(super) fn canonicalize_input<P: TypeFoldable<I>>(
199198
delegate: &'a D,
200199
variables: &'a mut Vec<I::GenericArg>,
201200
input: QueryInput<I, P>,

0 commit comments

Comments
 (0)