diff options
| author | Camille GILLOT <gillot.camille@gmail.com> | 2022-04-29 22:26:22 +0200 |
|---|---|---|
| committer | Camille GILLOT <gillot.camille@gmail.com> | 2022-04-29 22:26:22 +0200 |
| commit | 6e349c7f075d6791eec4c90aa3f2865dfd594da7 (patch) | |
| tree | b88141daf3c737a1e4e8b2a52c1d8a8f249cfea1 | |
| parent | f66de50f8a0b98f539f9882115cb1d1aa4c8e182 (diff) | |
| download | rust-6e349c7f075d6791eec4c90aa3f2865dfd594da7.tar.gz rust-6e349c7f075d6791eec4c90aa3f2865dfd594da7.zip | |
Remove `error` variable.
| -rw-r--r-- | compiler/rustc_resolve/src/late.rs | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/compiler/rustc_resolve/src/late.rs b/compiler/rustc_resolve/src/late.rs index 31f30f39c87..21b888c25c2 100644 --- a/compiler/rustc_resolve/src/late.rs +++ b/compiler/rustc_resolve/src/late.rs @@ -1319,7 +1319,6 @@ impl<'a: 'ast, 'b, 'ast> LateResolutionVisitor<'a, 'b, 'ast> { | PathSource::Struct | PathSource::TupleStruct(..) => false, }; - let mut error = true; let mut res = LifetimeRes::Error; for rib in self.lifetime_ribs.iter().rev() { match rib.kind { @@ -1339,15 +1338,14 @@ impl<'a: 'ast, 'b, 'ast> LateResolutionVisitor<'a, 'b, 'ast> { // lifetime. Instead, we simply create an implicit lifetime, which will be checked // later, at which point a suitable error will be emitted. LifetimeRibKind::AnonymousPassThrough(binder) => { - error = false; res = LifetimeRes::Anonymous { binder, elided: true }; break; } LifetimeRibKind::AnonymousReportError | LifetimeRibKind::Item => { // FIXME(cjgillot) This resolution is wrong, but this does not matter - // since these cases are erroneous anyway. + // since these cases are erroneous anyway. Lifetime resolution should + // emit a "missing lifetime specifier" diagnostic. res = LifetimeRes::Anonymous { binder: DUMMY_NODE_ID, elided: true }; - error = false; break; } _ => {} @@ -1377,7 +1375,7 @@ impl<'a: 'ast, 'b, 'ast> LateResolutionVisitor<'a, 'b, 'ast> { // originating from macros, since the segment's span might be from a macro arg. segment.ident.span.find_ancestor_inside(path_span).unwrap_or(path_span) }; - if error { + if let LifetimeRes::Error = res { let sess = self.r.session; let mut err = rustc_errors::struct_span_err!( sess, |
