diff options
| author | Guillaume Gomez <guillaume1.gomez@gmail.com> | 2016-08-05 16:13:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-05 16:13:00 +0200 |
| commit | 0339904fb479898ec3f2e9521c3398aac5ac8f79 (patch) | |
| tree | 4c98aaf3817d0093e42689b75e9c81c9729e13d0 | |
| parent | 8b9700898bb65620e8e5d00f268d42598525ab59 (diff) | |
| parent | b5b3539186b43d1291bcc5367171d9745f6a427f (diff) | |
Rollup merge of #35333 - nickmass:e0055-formatting, r=jonathandturner
Update compiler error E0055 to use new error format Addresses #35213, Part of the #35233 meta bug r? @jonathandturner
| -rw-r--r-- | src/librustc_typeck/check/autoderef.rs | 6 | ||||
| -rw-r--r-- | src/test/compile-fail/E0055.rs | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/librustc_typeck/check/autoderef.rs b/src/librustc_typeck/check/autoderef.rs index 3c176744fca..265422468fe 100644 --- a/src/librustc_typeck/check/autoderef.rs +++ b/src/librustc_typeck/check/autoderef.rs @@ -54,9 +54,11 @@ impl<'a, 'gcx, 'tcx> Iterator for Autoderef<'a, 'gcx, 'tcx> { if self.steps.len() == tcx.sess.recursion_limit.get() { // We've reached the recursion limit, error gracefully. - span_err!(tcx.sess, self.span, E0055, + struct_span_err!(tcx.sess, self.span, E0055, "reached the recursion limit while auto-dereferencing {:?}", - self.cur_ty); + self.cur_ty) + .span_label(self.span, &format!("deref recursion limit reached")) + .emit(); return None; } diff --git a/src/test/compile-fail/E0055.rs b/src/test/compile-fail/E0055.rs index f86d7ec114b..2b2d278ad4c 100644 --- a/src/test/compile-fail/E0055.rs +++ b/src/test/compile-fail/E0055.rs @@ -18,5 +18,7 @@ impl Foo { fn main() { let foo = Foo; let ref_foo = &&Foo; - ref_foo.foo(); //~ ERROR E0055 + ref_foo.foo(); + //~^ ERROR E0055 + //~| NOTE deref recursion limit reached } |
