hack for errs

lcnr · lcnr · commit 01ec1abed108 · 2023-12-19T09:10:26.000+01:00
diff --git a/compiler/rustc_infer/src/infer/relate/generalize.rs b/compiler/rustc_infer/src/infer/relate/generalize.rs
@@ -281,6 +281,8 @@ where
                                 ty::Invariant => {
                                     if self.for_universe.can_name(universe) {
                                         return Ok(t);
+                                    } else if self.infcx.next_trait_solver() && self.in_alias {
+                                        return Err(TypeError::Mismatch);
                                     }
                                 }
 
@@ -412,6 +414,8 @@ where
             let r_universe = self.infcx.universe_of_region(r);
             if self.for_universe.can_name(r_universe) {
                 return Ok(r);
+            } else if self.infcx.next_trait_solver() && self.in_alias {
+                return Err(TypeError::Mismatch);
             }
         }
 
@@ -452,6 +456,8 @@ where
                     ConstVariableValue::Unknown { universe } => {
                         if self.for_universe.can_name(universe) {
                             Ok(c)
+                        } else if self.infcx.next_trait_solver() && self.in_alias {
+                            return Err(TypeError::Mismatch);
                         } else {
                             let new_var_id = variable_table
                                 .new_key(ConstVarValue {
diff --git a/tests/ui/impl-trait/issue-103181-1.next.stderr b/tests/ui/impl-trait/issue-103181-1.next.stderr
@@ -1,3 +1,10 @@
+WARN rustc_infer::infer::relate::generalize may incompletely handle alias type: Alias(Projection, AliasTy { args: [!0, &RePlaceholder(!1_BoundRegion { var: 0, kind: BrNamed(DefId(0:34 ~ issue_103181_1[ac79]::hyper::{impl#2}::'a), 'a) }) ()], def_id: DefId(0:47 ~ issue_103181_1[ac79]::hyper::Service::Response) })
+WARN rustc_infer::infer::relate::generalize may incompletely handle alias type: Alias(Projection, AliasTy { args: [!0, &RePlaceholder(!1_BoundRegion { var: 0, kind: BrNamed(DefId(0:34 ~ issue_103181_1[ac79]::hyper::{impl#2}::'a), 'a) }) ()], def_id: DefId(0:47 ~ issue_103181_1[ac79]::hyper::Service::Response) })
+WARN rustc_infer::infer::relate::generalize may incompletely handle alias type: Alias(Projection, AliasTy { args: [!0, &RePlaceholder(!1_BoundRegion { var: 0, kind: BrNamed(DefId(0:34 ~ issue_103181_1[ac79]::hyper::{impl#2}::'a), 'a) }) ()], def_id: DefId(0:47 ~ issue_103181_1[ac79]::hyper::Service::Response) })
+WARN rustc_infer::infer::relate::generalize may incompletely handle alias type: Alias(Projection, AliasTy { args: [!0, &RePlaceholder(!1_BoundRegion { var: 0, kind: BrNamed(DefId(0:34 ~ issue_103181_1[ac79]::hyper::{impl#2}::'a), 'a) }) ()], def_id: DefId(0:47 ~ issue_103181_1[ac79]::hyper::Service::Response) })
+WARN rustc_infer::infer::relate::generalize may incompletely handle alias type: Alias(Projection, AliasTy { args: [!0, &RePlaceholder(!1_BoundRegion { var: 0, kind: BrNamed(DefId(0:34 ~ issue_103181_1[ac79]::hyper::{impl#2}::'a), 'a) }) ()], def_id: DefId(0:47 ~ issue_103181_1[ac79]::hyper::Service::Response) })
+WARN rustc_infer::infer::relate::generalize may incompletely handle alias type: Alias(Projection, AliasTy { args: [!0, &RePlaceholder(!1_BoundRegion { var: 0, kind: BrNamed(DefId(0:34 ~ issue_103181_1[ac79]::hyper::{impl#2}::'a), 'a) }) ()], def_id: DefId(0:47 ~ issue_103181_1[ac79]::hyper::Service::Response) })
+WARN rustc_infer::infer::relate::generalize may incompletely handle alias type: Alias(Projection, AliasTy { args: [!0, &RePlaceholder(!1_BoundRegion { var: 0, kind: BrNamed(DefId(0:34 ~ issue_103181_1[ac79]::hyper::{impl#2}::'a), 'a) }) ()], def_id: DefId(0:47 ~ issue_103181_1[ac79]::hyper::Service::Response) })
 error[E0046]: not all trait items implemented, missing: `Error`
   --> $DIR/issue-103181-1.rs:11:5
    |
@@ -7,6 +14,13 @@ LL |     }
 LL |     impl HttpBody for () {
    |     ^^^^^^^^^^^^^^^^^^^^ missing `Error` in implementation
 
+WARN rustc_infer::infer::relate::generalize may incompletely handle alias type: Alias(Projection, AliasTy { args: [!0, &RePlaceholder(!1_BoundRegion { var: 0, kind: BrNamed(DefId(0:34 ~ issue_103181_1[ac79]::hyper::{impl#2}::'a), 'a) }) ()], def_id: DefId(0:47 ~ issue_103181_1[ac79]::hyper::Service::Response) })
+WARN rustc_infer::infer::relate::generalize may incompletely handle alias type: Alias(Projection, AliasTy { args: [!0, &RePlaceholder(!1_BoundRegion { var: 0, kind: BrNamed(DefId(0:34 ~ issue_103181_1[ac79]::hyper::{impl#2}::'a), 'a) }) ()], def_id: DefId(0:47 ~ issue_103181_1[ac79]::hyper::Service::Response) })
+WARN rustc_infer::infer::relate::generalize may incompletely handle alias type: Alias(Projection, AliasTy { args: [!0, &RePlaceholder(!1_BoundRegion { var: 0, kind: BrNamed(DefId(0:34 ~ issue_103181_1[ac79]::hyper::{impl#2}::'a), 'a) }) ()], def_id: DefId(0:47 ~ issue_103181_1[ac79]::hyper::Service::Response) })
+WARN rustc_infer::infer::relate::generalize may incompletely handle alias type: Alias(Projection, AliasTy { args: [!0, &RePlaceholder(!1_BoundRegion { var: 0, kind: BrNamed(DefId(0:34 ~ issue_103181_1[ac79]::hyper::{impl#2}::'a), 'a) }) ()], def_id: DefId(0:47 ~ issue_103181_1[ac79]::hyper::Service::Response) })
+WARN rustc_infer::infer::relate::generalize may incompletely handle alias type: Alias(Projection, AliasTy { args: [!0, &RePlaceholder(!1_BoundRegion { var: 0, kind: BrNamed(DefId(0:34 ~ issue_103181_1[ac79]::hyper::{impl#2}::'a), 'a) }) ()], def_id: DefId(0:47 ~ issue_103181_1[ac79]::hyper::Service::Response) })
+WARN rustc_infer::infer::relate::generalize may incompletely handle alias type: Alias(Projection, AliasTy { args: [!0, &RePlaceholder(!1_BoundRegion { var: 0, kind: BrNamed(DefId(0:34 ~ issue_103181_1[ac79]::hyper::{impl#2}::'a), 'a) }) ()], def_id: DefId(0:47 ~ issue_103181_1[ac79]::hyper::Service::Response) })
+WARN rustc_infer::infer::relate::generalize may incompletely handle alias type: Alias(Projection, AliasTy { args: [!0, &RePlaceholder(!1_BoundRegion { var: 0, kind: BrNamed(DefId(0:34 ~ issue_103181_1[ac79]::hyper::{impl#2}::'a), 'a) }) ()], def_id: DefId(0:47 ~ issue_103181_1[ac79]::hyper::Service::Response) })
 error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0046`.
diff --git a/tests/ui/traits/next-solver/generalize/generalize-proj-new-universe-index-2.rs b/tests/ui/traits/next-solver/generalize/generalize-proj-new-universe-index-2.rs
@@ -1,8 +1,8 @@
 // compile-flags: -Znext-solver
-// known-bug: trait-system-refactor-initiative#60
+// check-pass
 
 // Generalizing a projection containing an inference variable
-// which cannot be named by the `root_vid` can result in ambiguity.
+// which cannot be named by the `root_vid` previously resulted in ambiguity.
 //
 // Because we do not decrement the universe index when exiting a forall,
 // this can cause unexpected failures.
diff --git a/tests/ui/traits/next-solver/generalize/generalize-proj-new-universe-index-2.stderr b/tests/ui/traits/next-solver/generalize/generalize-proj-new-universe-index-2.stderr
diff --git a/tests/ui/traits/next-solver/issue-118950-root-region.stderr b/tests/ui/traits/next-solver/issue-118950-root-region.stderr
@@ -15,12 +15,32 @@ LL | #![feature(lazy_type_alias)]
 
 WARN rustc_infer::infer::relate::generalize may incompletely handle alias type: Alias(Weak, AliasTy { args: [ReBound(DebruijnIndex(0), BoundRegion { var: 0, kind: BrNamed(DefId(0:15 ~ issue_118950_root_region[d54f]::{impl#1}::'a), 'a) }), ?1t], def_id: DefId(0:8 ~ issue_118950_root_region[d54f]::Assoc) })
 WARN rustc_infer::infer::relate::generalize may incompletely handle alias type: Alias(Weak, AliasTy { args: [RePlaceholder(!1_BoundRegion { var: 0, kind: BrNamed(DefId(0:15 ~ issue_118950_root_region[d54f]::{impl#1}::'a), 'a) }), ?1t], def_id: DefId(0:8 ~ issue_118950_root_region[d54f]::Assoc) })
+WARN rustc_infer::infer::relate::generalize may incompletely handle alias type: Alias(Weak, AliasTy { args: [RePlaceholder(!1_BoundRegion { var: 0, kind: BrNamed(DefId(0:15 ~ issue_118950_root_region[d54f]::{impl#1}::'a), 'a) }), ?1t], def_id: DefId(0:8 ~ issue_118950_root_region[d54f]::Assoc) })
+WARN rustc_infer::infer::relate::generalize may incompletely handle alias type: Alias(Projection, AliasTy { args: [*const {type error}, RePlaceholder(!1_BoundRegion { var: 0, kind: BrNamed(DefId(0:15 ~ issue_118950_root_region[d54f]::{impl#1}::'a), 'a) })], def_id: DefId(0:5 ~ issue_118950_root_region[d54f]::ToUnit::Unit) })
+WARN rustc_infer::infer::relate::generalize may incompletely handle alias type: Alias(Projection, AliasTy { args: [*const {type error}, RePlaceholder(!1_BoundRegion { var: 0, kind: BrNamed(DefId(0:15 ~ issue_118950_root_region[d54f]::{impl#1}::'a), 'a) })], def_id: DefId(0:5 ~ issue_118950_root_region[d54f]::ToUnit::Unit) })
+WARN rustc_infer::infer::relate::generalize may incompletely handle alias type: Alias(Projection, AliasTy { args: [*const {type error}, RePlaceholder(!1_BoundRegion { var: 0, kind: BrNamed(DefId(0:15 ~ issue_118950_root_region[d54f]::{impl#1}::'a), 'a) })], def_id: DefId(0:5 ~ issue_118950_root_region[d54f]::ToUnit::Unit) })
+WARN rustc_infer::infer::relate::generalize may incompletely handle alias type: Alias(Projection, AliasTy { args: [*const {type error}, RePlaceholder(!1_BoundRegion { var: 0, kind: BrNamed(DefId(0:15 ~ issue_118950_root_region[d54f]::{impl#1}::'a), 'a) })], def_id: DefId(0:5 ~ issue_118950_root_region[d54f]::ToUnit::Unit) })
+WARN rustc_infer::infer::relate::generalize may incompletely handle alias type: Alias(Projection, AliasTy { args: [*const {type error}, RePlaceholder(!1_BoundRegion { var: 0, kind: BrNamed(DefId(0:15 ~ issue_118950_root_region[d54f]::{impl#1}::'a), 'a) })], def_id: DefId(0:5 ~ issue_118950_root_region[d54f]::ToUnit::Unit) })
+WARN rustc_infer::infer::relate::generalize may incompletely handle alias type: Alias(Projection, AliasTy { args: [*const {type error}, RePlaceholder(!1_BoundRegion { var: 0, kind: BrNamed(DefId(0:15 ~ issue_118950_root_region[d54f]::{impl#1}::'a), 'a) })], def_id: DefId(0:5 ~ issue_118950_root_region[d54f]::ToUnit::Unit) })
+WARN rustc_infer::infer::relate::generalize may incompletely handle alias type: Alias(Projection, AliasTy { args: [*const {type error}, RePlaceholder(!1_BoundRegion { var: 0, kind: BrNamed(DefId(0:15 ~ issue_118950_root_region[d54f]::{impl#1}::'a), 'a) })], def_id: DefId(0:5 ~ issue_118950_root_region[d54f]::ToUnit::Unit) })
+WARN rustc_infer::infer::relate::generalize may incompletely handle alias type: Alias(Weak, AliasTy { args: [RePlaceholder(!1_BoundRegion { var: 0, kind: BrNamed(DefId(0:15 ~ issue_118950_root_region[d54f]::{impl#1}::'a), 'a) }), ?1t], def_id: DefId(0:8 ~ issue_118950_root_region[d54f]::Assoc) })
+WARN rustc_infer::infer::relate::generalize may incompletely handle alias type: Alias(Projection, AliasTy { args: [*const {type error}, RePlaceholder(!1_BoundRegion { var: 0, kind: BrNamed(DefId(0:15 ~ issue_118950_root_region[d54f]::{impl#1}::'a), 'a) })], def_id: DefId(0:5 ~ issue_118950_root_region[d54f]::ToUnit::Unit) })
+WARN rustc_infer::infer::relate::generalize may incompletely handle alias type: Alias(Projection, AliasTy { args: [*const {type error}, RePlaceholder(!1_BoundRegion { var: 0, kind: BrNamed(DefId(0:15 ~ issue_118950_root_region[d54f]::{impl#1}::'a), 'a) })], def_id: DefId(0:5 ~ issue_118950_root_region[d54f]::ToUnit::Unit) })
+WARN rustc_infer::infer::relate::generalize may incompletely handle alias type: Alias(Projection, AliasTy { args: [*const {type error}, RePlaceholder(!1_BoundRegion { var: 0, kind: BrNamed(DefId(0:15 ~ issue_118950_root_region[d54f]::{impl#1}::'a), 'a) })], def_id: DefId(0:5 ~ issue_118950_root_region[d54f]::ToUnit::Unit) })
+WARN rustc_infer::infer::relate::generalize may incompletely handle alias type: Alias(Projection, AliasTy { args: [*const {type error}, RePlaceholder(!1_BoundRegion { var: 0, kind: BrNamed(DefId(0:15 ~ issue_118950_root_region[d54f]::{impl#1}::'a), 'a) })], def_id: DefId(0:5 ~ issue_118950_root_region[d54f]::ToUnit::Unit) })
+WARN rustc_infer::infer::relate::generalize may incompletely handle alias type: Alias(Projection, AliasTy { args: [*const {type error}, RePlaceholder(!1_BoundRegion { var: 0, kind: BrNamed(DefId(0:15 ~ issue_118950_root_region[d54f]::{impl#1}::'a), 'a) })], def_id: DefId(0:5 ~ issue_118950_root_region[d54f]::ToUnit::Unit) })
+WARN rustc_infer::infer::relate::generalize may incompletely handle alias type: Alias(Projection, AliasTy { args: [*const {type error}, RePlaceholder(!1_BoundRegion { var: 0, kind: BrNamed(DefId(0:15 ~ issue_118950_root_region[d54f]::{impl#1}::'a), 'a) })], def_id: DefId(0:5 ~ issue_118950_root_region[d54f]::ToUnit::Unit) })
+WARN rustc_infer::infer::relate::generalize may incompletely handle alias type: Alias(Projection, AliasTy { args: [*const {type error}, RePlaceholder(!1_BoundRegion { var: 0, kind: BrNamed(DefId(0:15 ~ issue_118950_root_region[d54f]::{impl#1}::'a), 'a) })], def_id: DefId(0:5 ~ issue_118950_root_region[d54f]::ToUnit::Unit) })
+WARN rustc_infer::infer::relate::generalize may incompletely handle alias type: Alias(Projection, AliasTy { args: [*const {type error}, RePlaceholder(!2_BoundRegion { var: 0, kind: BrNamed(DefId(0:15 ~ issue_118950_root_region[d54f]::{impl#1}::'a), 'a) })], def_id: DefId(0:5 ~ issue_118950_root_region[d54f]::ToUnit::Unit) })
 WARN rustc_infer::infer::relate::generalize may incompletely handle alias type: Alias(Weak, AliasTy { args: [ReBound(DebruijnIndex(0), BoundRegion { var: 0, kind: BrNamed(DefId(0:15 ~ issue_118950_root_region[d54f]::{impl#1}::'a), 'a) }), ?1t], def_id: DefId(0:8 ~ issue_118950_root_region[d54f]::Assoc) })
 WARN rustc_infer::infer::relate::generalize may incompletely handle alias type: Alias(Weak, AliasTy { args: [RePlaceholder(!1_BoundRegion { var: 0, kind: BrNamed(DefId(0:15 ~ issue_118950_root_region[d54f]::{impl#1}::'a), 'a) }), ?1t], def_id: DefId(0:8 ~ issue_118950_root_region[d54f]::Assoc) })
+WARN rustc_infer::infer::relate::generalize may incompletely handle alias type: Alias(Projection, AliasTy { args: [*const {type error}, RePlaceholder(!2_BoundRegion { var: 0, kind: BrNamed(DefId(0:15 ~ issue_118950_root_region[d54f]::{impl#1}::'a), 'a) })], def_id: DefId(0:5 ~ issue_118950_root_region[d54f]::ToUnit::Unit) })
 WARN rustc_infer::infer::relate::generalize may incompletely handle alias type: Alias(Weak, AliasTy { args: [ReBound(DebruijnIndex(0), BoundRegion { var: 0, kind: BrNamed(DefId(0:15 ~ issue_118950_root_region[d54f]::{impl#1}::'a), 'a) }), ?1t], def_id: DefId(0:8 ~ issue_118950_root_region[d54f]::Assoc) })
 WARN rustc_infer::infer::relate::generalize may incompletely handle alias type: Alias(Weak, AliasTy { args: [RePlaceholder(!1_BoundRegion { var: 0, kind: BrNamed(DefId(0:15 ~ issue_118950_root_region[d54f]::{impl#1}::'a), 'a) }), ?1t], def_id: DefId(0:8 ~ issue_118950_root_region[d54f]::Assoc) })
+WARN rustc_infer::infer::relate::generalize may incompletely handle alias type: Alias(Projection, AliasTy { args: [*const {type error}, RePlaceholder(!2_BoundRegion { var: 0, kind: BrNamed(DefId(0:15 ~ issue_118950_root_region[d54f]::{impl#1}::'a), 'a) })], def_id: DefId(0:5 ~ issue_118950_root_region[d54f]::ToUnit::Unit) })
 WARN rustc_infer::infer::relate::generalize may incompletely handle alias type: Alias(Weak, AliasTy { args: [ReBound(DebruijnIndex(0), BoundRegion { var: 0, kind: BrNamed(DefId(0:15 ~ issue_118950_root_region[d54f]::{impl#1}::'a), 'a) }), ?1t], def_id: DefId(0:8 ~ issue_118950_root_region[d54f]::Assoc) })
 WARN rustc_infer::infer::relate::generalize may incompletely handle alias type: Alias(Weak, AliasTy { args: [RePlaceholder(!1_BoundRegion { var: 0, kind: BrNamed(DefId(0:15 ~ issue_118950_root_region[d54f]::{impl#1}::'a), 'a) }), ?1t], def_id: DefId(0:8 ~ issue_118950_root_region[d54f]::Assoc) })
+WARN rustc_infer::infer::relate::generalize may incompletely handle alias type: Alias(Projection, AliasTy { args: [*const {type error}, RePlaceholder(!2_BoundRegion { var: 0, kind: BrNamed(DefId(0:15 ~ issue_118950_root_region[d54f]::{impl#1}::'a), 'a) })], def_id: DefId(0:5 ~ issue_118950_root_region[d54f]::ToUnit::Unit) })
 error[E0119]: conflicting implementations of trait `Overlap<fn(_)>` for type `fn(_)`
   --> $DIR/issue-118950-root-region.rs:18:1
    |

Original file line number	Diff line number	Diff line change
`@@ -281,6 +281,8 @@ where`
`281`	`281`	`ty::Invariant => {`
`282`	`282`	`if self.for_universe.can_name(universe) {`
`283`	`283`	`return Ok(t);`
	`284`	`+ } else if self.infcx.next_trait_solver() && self.in_alias {`
	`285`	`+ return Err(TypeError::Mismatch);`
`284`	`286`	`}`
`285`	`287`	`}`
`286`	`288`
`@@ -412,6 +414,8 @@ where`
`412`	`414`	`let r_universe = self.infcx.universe_of_region(r);`
`413`	`415`	`if self.for_universe.can_name(r_universe) {`
`414`	`416`	`return Ok(r);`
	`417`	`+ } else if self.infcx.next_trait_solver() && self.in_alias {`
	`418`	`+ return Err(TypeError::Mismatch);`
`415`	`419`	`}`
`416`	`420`	`}`
`417`	`421`
`@@ -452,6 +456,8 @@ where`
`452`	`456`	`ConstVariableValue::Unknown { universe } => {`
`453`	`457`	`if self.for_universe.can_name(universe) {`
`454`	`458`	`Ok(c)`
	`459`	`+ } else if self.infcx.next_trait_solver() && self.in_alias {`
	`460`	`+ return Err(TypeError::Mismatch);`
`455`	`461`	`} else {`
`456`	`462`	`let new_var_id = variable_table`
`457`	`463`	`.new_key(ConstVarValue {`