Skip to content

Commit

Permalink
Rollup merge of rust-lang#62523 - pnkfelix:delay-bug-to-resolve-issue…
Browse files Browse the repository at this point in the history
…-62203-ice, r=varkor

Delay bug to resolve HRTB ICE

Fix rust-lang#62203
  • Loading branch information
Centril authored Jul 22, 2019
2 parents c3aa3d8 + 837fe7b commit 723fd5d
Show file tree
Hide file tree
Showing 3 changed files with 82 additions and 9 deletions.
19 changes: 10 additions & 9 deletions src/librustc/infer/lexical_region_resolve/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -764,16 +764,17 @@ impl<'cx, 'tcx> LexicalResolver<'cx, 'tcx> {
}
}

span_bug!(
// Errors in earlier passes can yield error variables without
// resolution errors here; delay ICE in favor of those errors.
self.tcx().sess.delay_span_bug(
self.var_infos[node_idx].origin.span(),
"collect_error_for_expanding_node() could not find \
error for var {:?} in universe {:?}, lower_bounds={:#?}, \
upper_bounds={:#?}",
node_idx,
node_universe,
lower_bounds,
upper_bounds
);
&format!("collect_error_for_expanding_node() could not find \
error for var {:?} in universe {:?}, lower_bounds={:#?}, \
upper_bounds={:#?}",
node_idx,
node_universe,
lower_bounds,
upper_bounds));
}

fn collect_concrete_regions(
Expand Down
50 changes: 50 additions & 0 deletions src/test/ui/hrtb/issue-62203-hrtb-ice.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
trait T0<'a, A> {
type O;
}

struct L<T> {
f: T,
}

// explicitly named variants of what one would normally denote by the
// unit type `()`. Why do this? So that we can differentiate them in
// the diagnostic output.
struct Unit1;
struct Unit2;
struct Unit3;
struct Unit4;

impl<'a, A, T> T0<'a, A> for L<T>
where
T: FnMut(A) -> Unit3,
{
type O = T::Output;
}

trait T1: for<'r> Ty<'r> {
fn m<'a, B: Ty<'a>, F>(&self, f: F) -> Unit1
where
F: for<'r> T0<'r, (<Self as Ty<'r>>::V,), O = <B as Ty<'r>>::V>,
{
unimplemented!();
}
}

trait Ty<'a> {
type V;
}

fn main() {
let v = Unit2.m(
//~^ ERROR type mismatch
//~| ERROR type mismatch
L {
f : |x| { drop(x); Unit4 }
});
}

impl<'a> Ty<'a> for Unit2 {
type V = &'a u8;
}

impl T1 for Unit2 {}
22 changes: 22 additions & 0 deletions src/test/ui/hrtb/issue-62203-hrtb-ice.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
error[E0271]: type mismatch resolving `for<'r> <L<[closure@$DIR/issue-62203-hrtb-ice.rs:42:17: 42:39]> as T0<'r, (<Unit2 as Ty<'r>>::V,)>>::O == <_ as Ty<'r>>::V`
--> $DIR/issue-62203-hrtb-ice.rs:38:19
|
LL | let v = Unit2.m(
| ^ expected struct `Unit4`, found associated type
|
= note: expected type `Unit4`
found type `<_ as Ty<'_>>::V`

error[E0271]: type mismatch resolving `<[closure@$DIR/issue-62203-hrtb-ice.rs:42:17: 42:39] as std::ops::FnOnce<((&u8,),)>>::Output == Unit3`
--> $DIR/issue-62203-hrtb-ice.rs:38:19
|
LL | let v = Unit2.m(
| ^ expected struct `Unit4`, found struct `Unit3`
|
= note: expected type `Unit4`
found type `Unit3`
= note: required because of the requirements on the impl of `for<'r> T0<'r, (<Unit2 as Ty<'r>>::V,)>` for `L<[closure@$DIR/issue-62203-hrtb-ice.rs:42:17: 42:39]>`

error: aborting due to 2 previous errors

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

0 comments on commit 723fd5d

Please sign in to comment.