Skip to content

Commit

Permalink
Rollup merge of #100688 - compiler-errors:issue-100684, r=wesleywiser
Browse files Browse the repository at this point in the history
`ty::Error` does not match other types for region constraints

Fixes #100684
  • Loading branch information
matthiaskrgr authored Aug 18, 2022
2 parents 3de034d + fc7fc0f commit c7a4942
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 1 deletion.
9 changes: 8 additions & 1 deletion compiler/rustc_infer/src/infer/outlives/test_type_match.rs
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,14 @@ impl<'tcx> TypeRelation<'tcx> for Match<'tcx> {

#[instrument(skip(self), level = "debug")]
fn tys(&mut self, pattern: Ty<'tcx>, value: Ty<'tcx>) -> RelateResult<'tcx, Ty<'tcx>> {
if pattern == value { Ok(pattern) } else { relate::super_relate_tys(self, pattern, value) }
if let ty::Error(_) = pattern.kind() {
// Unlike normal `TypeRelation` rules, `ty::Error` does not equal any type.
self.no_match()
} else if pattern == value {
Ok(pattern)
} else {
relate::super_relate_tys(self, pattern, value)
}
}

#[instrument(skip(self), level = "debug")]
Expand Down
16 changes: 16 additions & 0 deletions src/test/ui/regions/outlives-with-missing.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
trait HandlerFamily {
type Target;
}

struct HandlerWrapper<H: HandlerFamily>(H);

impl<H: HandlerFamily> HandlerWrapper<H> {
pub fn set_handler(&self, handler: &H::Target)
where
T: Send + Sync + 'static,
//~^ ERROR cannot find type `T` in this scope
{
}
}

fn main() {}
12 changes: 12 additions & 0 deletions src/test/ui/regions/outlives-with-missing.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
error[E0412]: cannot find type `T` in this scope
--> $DIR/outlives-with-missing.rs:10:9
|
LL | impl<H: HandlerFamily> HandlerWrapper<H> {
| - similarly named type parameter `H` defined here
...
LL | T: Send + Sync + 'static,
| ^ help: a type parameter with a similar name exists: `H`

error: aborting due to previous error

For more information about this error, try `rustc --explain E0412`.

0 comments on commit c7a4942

Please sign in to comment.