Skip to content

Commit 7690f29

Browse files
borsbors
committed
Auto merge of #125230 - compiler-errors:uplift-query-stuff, r=lcnr
Uplift more query stuff - Uplift various query input/response internals - Uplift the `ProofTree` structures and make the `ProofTreeBuilder` stuff (mostly) generic over `Interner` - Stop using `TyCtxt::def_kind` in favor of `AliasTerm::kind` r? lcnr
2 parents b1ec1bd + 8e1dba4 commit 7690f29

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+886
-681
lines changed

‎Cargo.lock

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4343,6 +4343,7 @@ dependencies = [
43434343
"rustc_hir_pretty",
43444344
"rustc_index",
43454345
"rustc_macros",
4346+
"rustc_next_trait_solver",
43464347
"rustc_query_system",
43474348
"rustc_serialize",
43484349
"rustc_session",
@@ -4451,7 +4452,13 @@ dependencies = [
44514452
name = "rustc_next_trait_solver"
44524453
version = "0.0.0"
44534454
dependencies = [
4455+
"derivative",
4456+
"rustc_ast_ir",
4457+
"rustc_data_structures",
4458+
"rustc_macros",
4459+
"rustc_serialize",
44544460
"rustc_type_ir",
4461+
"rustc_type_ir_macros",
44554462
]
44564463

44574464
[[package]]
@@ -4752,6 +4759,7 @@ name = "rustc_trait_selection"
47524759
version = "0.0.0"
47534760
dependencies = [
47544761
"bitflags 2.5.0",
4762+
"derivative",
47554763
"itertools 0.12.1",
47564764
"rustc_ast",
47574765
"rustc_ast_ir",
@@ -4767,10 +4775,13 @@ dependencies = [
47674775
"rustc_next_trait_solver",
47684776
"rustc_parse_format",
47694777
"rustc_query_system",
4778+
"rustc_serialize",
47704779
"rustc_session",
47714780
"rustc_span",
47724781
"rustc_target",
47734782
"rustc_transmute",
4783+
"rustc_type_ir",
4784+
"rustc_type_ir_macros",
47744785
"smallvec",
47754786
"tracing",
47764787
]

‎compiler/rustc_infer/src/infer/at.rs

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -385,19 +385,31 @@ impl<'tcx> ToTrace<'tcx> for ty::GenericArg<'tcx> {
385385
a: Self,
386386
b: Self,
387387
) -> TypeTrace<'tcx> {
388-
use GenericArgKind::*;
389388
TypeTrace {
390389
cause: cause.clone(),
391390
values: match (a.unpack(), b.unpack()) {
392-
(Lifetime(a), Lifetime(b)) => Regions(ExpectedFound::new(a_is_expected, a, b)),
393-
(Type(a), Type(b)) => Terms(ExpectedFound::new(a_is_expected, a.into(), b.into())),
394-
(Const(a), Const(b)) => {
391+
(GenericArgKind::Lifetime(a), GenericArgKind::Lifetime(b)) => {
392+
Regions(ExpectedFound::new(a_is_expected, a, b))
393+
}
394+
(GenericArgKind::Type(a), GenericArgKind::Type(b)) => {
395+
Terms(ExpectedFound::new(a_is_expected, a.into(), b.into()))
396+
}
397+
(GenericArgKind::Const(a), GenericArgKind::Const(b)) => {
395398
Terms(ExpectedFound::new(a_is_expected, a.into(), b.into()))
396399
}
397400

398-
(Lifetime(_), Type(_) | Const(_))
399-
| (Type(_), Lifetime(_) | Const(_))
400-
| (Const(_), Lifetime(_) | Type(_)) => {
401+
(
402+
GenericArgKind::Lifetime(_),
403+
GenericArgKind::Type(_) | GenericArgKind::Const(_),
404+
)
405+
| (
406+
GenericArgKind::Type(_),
407+
GenericArgKind::Lifetime(_) | GenericArgKind::Const(_),
408+
)
409+
| (
410+
GenericArgKind::Const(_),
411+
GenericArgKind::Lifetime(_) | GenericArgKind::Type(_),
412+
) => {
401413
bug!("relating different kinds: {a:?} {b:?}")
402414
}
403415
},

‎compiler/rustc_infer/src/traits/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,9 @@ impl<T: Hash> Hash for Obligation<'_, T> {
7878
}
7979
}
8080

81-
impl<'tcx, P> From<Obligation<'tcx, P>> for ty::Goal<'tcx, P> {
81+
impl<'tcx, P> From<Obligation<'tcx, P>> for solve::Goal<'tcx, P> {
8282
fn from(value: Obligation<'tcx, P>) -> Self {
83-
ty::Goal { param_env: value.param_env, predicate: value.predicate }
83+
solve::Goal { param_env: value.param_env, predicate: value.predicate }
8484
}
8585
}
8686

‎compiler/rustc_middle/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ rustc_hir = { path = "../rustc_hir" }
2828
rustc_hir_pretty = { path = "../rustc_hir_pretty" }
2929
rustc_index = { path = "../rustc_index" }
3030
rustc_macros = { path = "../rustc_macros" }
31+
rustc_next_trait_solver = { path = "../rustc_next_trait_solver" }
3132
rustc_query_system = { path = "../rustc_query_system" }
3233
rustc_serialize = { path = "../rustc_serialize" }
3334
rustc_session = { path = "../rustc_session" }

‎compiler/rustc_middle/src/arena.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ macro_rules! arena_types {
6161
[] dtorck_constraint: rustc_middle::traits::query::DropckConstraint<'tcx>,
6262
[] candidate_step: rustc_middle::traits::query::CandidateStep<'tcx>,
6363
[] autoderef_bad_ty: rustc_middle::traits::query::MethodAutoderefBadTy<'tcx>,
64-
[] canonical_goal_evaluation: rustc_middle::traits::solve::inspect::GoalEvaluationStep<'tcx>,
64+
[] canonical_goal_evaluation: rustc_next_trait_solver::solve::inspect::GoalEvaluationStep<rustc_middle::ty::TyCtxt<'tcx>>,
6565
[] query_region_constraints: rustc_middle::infer::canonical::QueryRegionConstraints<'tcx>,
6666
[] type_op_subtype:
6767
rustc_middle::infer::canonical::Canonical<'tcx,

‎compiler/rustc_middle/src/infer/canonical.rs

Lines changed: 6 additions & 149 deletions
Original file line numberDiff line numberDiff line change
@@ -23,23 +23,20 @@
2323
2424
use rustc_data_structures::fx::FxHashMap;
2525
use rustc_data_structures::sync::Lock;
26-
use rustc_macros::{HashStable, TyDecodable, TyEncodable, TypeFoldable, TypeVisitable};
27-
use rustc_type_ir::Canonical as IrCanonical;
28-
use rustc_type_ir::CanonicalVarInfo as IrCanonicalVarInfo;
26+
use rustc_macros::{HashStable, TypeFoldable, TypeVisitable};
27+
pub use rustc_type_ir as ir;
2928
pub use rustc_type_ir::{CanonicalTyVarKind, CanonicalVarKind};
3029
use smallvec::SmallVec;
3130
use std::collections::hash_map::Entry;
32-
use std::ops::Index;
3331

3432
use crate::infer::MemberConstraint;
3533
use crate::mir::ConstraintCategory;
3634
use crate::ty::GenericArg;
37-
use crate::ty::{self, BoundVar, List, Region, Ty, TyCtxt, TypeFlags, TypeVisitableExt};
38-
39-
pub type Canonical<'tcx, V> = IrCanonical<TyCtxt<'tcx>, V>;
40-
41-
pub type CanonicalVarInfo<'tcx> = IrCanonicalVarInfo<TyCtxt<'tcx>>;
35+
use crate::ty::{self, List, Region, Ty, TyCtxt, TypeFlags, TypeVisitableExt};
4236

37+
pub type Canonical<'tcx, V> = ir::Canonical<TyCtxt<'tcx>, V>;
38+
pub type CanonicalVarInfo<'tcx> = ir::CanonicalVarInfo<TyCtxt<'tcx>>;
39+
pub type CanonicalVarValues<'tcx> = ir::CanonicalVarValues<TyCtxt<'tcx>>;
4340
pub type CanonicalVarInfos<'tcx> = &'tcx List<CanonicalVarInfo<'tcx>>;
4441

4542
impl<'tcx> ty::TypeFoldable<TyCtxt<'tcx>> for CanonicalVarInfos<'tcx> {
@@ -51,74 +48,6 @@ impl<'tcx> ty::TypeFoldable<TyCtxt<'tcx>> for CanonicalVarInfos<'tcx> {
5148
}
5249
}
5350

54-
/// A set of values corresponding to the canonical variables from some
55-
/// `Canonical`. You can give these values to
56-
/// `canonical_value.instantiate` to instantiate them into the canonical
57-
/// value at the right places.
58-
///
59-
/// When you canonicalize a value `V`, you get back one of these
60-
/// vectors with the original values that were replaced by canonical
61-
/// variables. You will need to supply it later to instantiate the
62-
/// canonicalized query response.
63-
#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, TyDecodable, TyEncodable)]
64-
#[derive(HashStable, TypeFoldable, TypeVisitable)]
65-
pub struct CanonicalVarValues<'tcx> {
66-
pub var_values: ty::GenericArgsRef<'tcx>,
67-
}
68-
69-
impl CanonicalVarValues<'_> {
70-
pub fn is_identity(&self) -> bool {
71-
self.var_values.iter().enumerate().all(|(bv, arg)| match arg.unpack() {
72-
ty::GenericArgKind::Lifetime(r) => {
73-
matches!(*r, ty::ReBound(ty::INNERMOST, br) if br.var.as_usize() == bv)
74-
}
75-
ty::GenericArgKind::Type(ty) => {
76-
matches!(*ty.kind(), ty::Bound(ty::INNERMOST, bt) if bt.var.as_usize() == bv)
77-
}
78-
ty::GenericArgKind::Const(ct) => {
79-
matches!(ct.kind(), ty::ConstKind::Bound(ty::INNERMOST, bc) if bc.as_usize() == bv)
80-
}
81-
})
82-
}
83-
84-
pub fn is_identity_modulo_regions(&self) -> bool {
85-
let mut var = ty::BoundVar::ZERO;
86-
for arg in self.var_values {
87-
match arg.unpack() {
88-
ty::GenericArgKind::Lifetime(r) => {
89-
if let ty::ReBound(ty::INNERMOST, br) = *r
90-
&& var == br.var
91-
{
92-
var = var + 1;
93-
} else {
94-
// It's ok if this region var isn't unique
95-
}
96-
}
97-
ty::GenericArgKind::Type(ty) => {
98-
if let ty::Bound(ty::INNERMOST, bt) = *ty.kind()
99-
&& var == bt.var
100-
{
101-
var = var + 1;
102-
} else {
103-
return false;
104-
}
105-
}
106-
ty::GenericArgKind::Const(ct) => {
107-
if let ty::ConstKind::Bound(ty::INNERMOST, bc) = ct.kind()
108-
&& var == bc
109-
{
110-
var = var + 1;
111-
} else {
112-
return false;
113-
}
114-
}
115-
}
116-
}
117-
118-
true
119-
}
120-
}
121-
12251
/// When we canonicalize a value to form a query, we wind up replacing
12352
/// various parts of it with canonical variables. This struct stores
12453
/// those replaced bits to remember for when we process the query
@@ -218,78 +147,6 @@ TrivialTypeTraversalImpls! {
218147
crate::infer::canonical::Certainty,
219148
}
220149

221-
impl<'tcx> CanonicalVarValues<'tcx> {
222-
// Given a list of canonical variables, construct a set of values which are
223-
// the identity response.
224-
pub fn make_identity(
225-
tcx: TyCtxt<'tcx>,
226-
infos: CanonicalVarInfos<'tcx>,
227-
) -> CanonicalVarValues<'tcx> {
228-
CanonicalVarValues {
229-
var_values: tcx.mk_args_from_iter(infos.iter().enumerate().map(
230-
|(i, info)| -> ty::GenericArg<'tcx> {
231-
match info.kind {
232-
CanonicalVarKind::Ty(_) | CanonicalVarKind::PlaceholderTy(_) => {
233-
Ty::new_bound(tcx, ty::INNERMOST, ty::BoundVar::from_usize(i).into())
234-
.into()
235-
}
236-
CanonicalVarKind::Region(_) | CanonicalVarKind::PlaceholderRegion(_) => {
237-
let br = ty::BoundRegion {
238-
var: ty::BoundVar::from_usize(i),
239-
kind: ty::BrAnon,
240-
};
241-
ty::Region::new_bound(tcx, ty::INNERMOST, br).into()
242-
}
243-
CanonicalVarKind::Effect => ty::Const::new_bound(
244-
tcx,
245-
ty::INNERMOST,
246-
ty::BoundVar::from_usize(i),
247-
tcx.types.bool,
248-
)
249-
.into(),
250-
CanonicalVarKind::Const(_, ty)
251-
| CanonicalVarKind::PlaceholderConst(_, ty) => ty::Const::new_bound(
252-
tcx,
253-
ty::INNERMOST,
254-
ty::BoundVar::from_usize(i),
255-
ty,
256-
)
257-
.into(),
258-
}
259-
},
260-
)),
261-
}
262-
}
263-
264-
/// Creates dummy var values which should not be used in a
265-
/// canonical response.
266-
pub fn dummy() -> CanonicalVarValues<'tcx> {
267-
CanonicalVarValues { var_values: ty::List::empty() }
268-
}
269-
270-
#[inline]
271-
pub fn len(&self) -> usize {
272-
self.var_values.len()
273-
}
274-
}
275-
276-
impl<'a, 'tcx> IntoIterator for &'a CanonicalVarValues<'tcx> {
277-
type Item = GenericArg<'tcx>;
278-
type IntoIter = ::std::iter::Copied<::std::slice::Iter<'a, GenericArg<'tcx>>>;
279-
280-
fn into_iter(self) -> Self::IntoIter {
281-
self.var_values.iter()
282-
}
283-
}
284-
285-
impl<'tcx> Index<BoundVar> for CanonicalVarValues<'tcx> {
286-
type Output = GenericArg<'tcx>;
287-
288-
fn index(&self, value: BoundVar) -> &GenericArg<'tcx> {
289-
&self.var_values[value.as_usize()]
290-
}
291-
}
292-
293150
#[derive(Default)]
294151
pub struct CanonicalParamEnvCache<'tcx> {
295152
map: Lock<

‎compiler/rustc_middle/src/traits/mod.rs

Lines changed: 2 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ pub mod specialization_graph;
99
mod structural_impls;
1010
pub mod util;
1111

12-
use crate::infer::canonical::Canonical;
1312
use crate::mir::ConstraintCategory;
1413
use crate::ty::abstract_const::NotConstEvaluatable;
1514
use crate::ty::GenericArgsRef;
@@ -32,6 +31,8 @@ use std::borrow::Cow;
3231
use std::hash::{Hash, Hasher};
3332

3433
pub use self::select::{EvaluationCache, EvaluationResult, OverflowError, SelectionCache};
34+
// FIXME: Remove this import and import via `solve::`
35+
pub use rustc_next_trait_solver::solve::BuiltinImplSource;
3536

3637
/// Depending on the stage of compilation, we want projection to be
3738
/// more or less conservative.
@@ -736,32 +737,6 @@ pub struct ImplSourceUserDefinedData<'tcx, N> {
736737
pub nested: Vec<N>,
737738
}
738739

739-
#[derive(Copy, Clone, PartialEq, Eq, TyEncodable, TyDecodable, HashStable, Debug)]
740-
pub enum BuiltinImplSource {
741-
/// Some builtin impl we don't need to differentiate. This should be used
742-
/// unless more specific information is necessary.
743-
Misc,
744-
/// A builtin impl for trait objects.
745-
///
746-
/// The vtable is formed by concatenating together the method lists of
747-
/// the base object trait and all supertraits, pointers to supertrait vtable will
748-
/// be provided when necessary; this is the start of `upcast_trait_ref`'s methods
749-
/// in that vtable.
750-
Object { vtable_base: usize },
751-
/// The vtable is formed by concatenating together the method lists of
752-
/// the base object trait and all supertraits, pointers to supertrait vtable will
753-
/// be provided when necessary; this is the position of `upcast_trait_ref`'s vtable
754-
/// within that vtable.
755-
TraitUpcasting { vtable_vptr_slot: Option<usize> },
756-
/// Unsizing a tuple like `(A, B, ..., X)` to `(A, B, ..., Y)` if `X` unsizes to `Y`.
757-
///
758-
/// This needs to be a separate variant as it is still unstable and we need to emit
759-
/// a feature error when using it on stable.
760-
TupleUnsizing,
761-
}
762-
763-
TrivialTypeTraversalImpls! { BuiltinImplSource }
764-
765740
#[derive(Clone, Debug, PartialEq, Eq, Hash, HashStable, PartialOrd, Ord)]
766741
pub enum ObjectSafetyViolation {
767742
/// `Self: Sized` declared on the trait.

‎compiler/rustc_middle/src/traits/query.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ use crate::ty::GenericArg;
1212
use crate::ty::{self, Ty, TyCtxt};
1313
use rustc_macros::{HashStable, TypeFoldable, TypeVisitable};
1414
use rustc_span::Span;
15+
// FIXME: Remove this import and import via `traits::solve`.
16+
pub use rustc_next_trait_solver::solve::NoSolution;
1517

1618
pub mod type_op {
1719
use crate::ty::fold::TypeFoldable;
@@ -89,9 +91,6 @@ pub type CanonicalTypeOpProvePredicateGoal<'tcx> =
8991
pub type CanonicalTypeOpNormalizeGoal<'tcx, T> =
9092
Canonical<'tcx, ty::ParamEnvAnd<'tcx, type_op::Normalize<T>>>;
9193

92-
#[derive(Copy, Clone, Debug, Hash, HashStable, PartialEq, Eq)]
93-
pub struct NoSolution;
94-
9594
impl<'tcx> From<TypeError<'tcx>> for NoSolution {
9695
fn from(_: TypeError<'tcx>) -> NoSolution {
9796
NoSolution

0 commit comments

Comments
 (0)