diff options
| author | Yuki Okushi <huyuumi.dev@gmail.com> | 2020-08-11 16:23:56 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-11 16:23:56 +0900 |
| commit | 0a8d4db4d8ff70d50d92974f3b34fada51cc8dcf (patch) | |
| tree | 1bdf510a7c82e91d2cbe8256382c2d4023c6d7f1 | |
| parent | e51a839030931638d8cb3e2b573ed812602d297d (diff) | |
| parent | 7e0180906b0fe738596bff512c96c3f36afaf6b7 (diff) | |
| download | rust-0a8d4db4d8ff70d50d92974f3b34fada51cc8dcf.tar.gz rust-0a8d4db4d8ff70d50d92974f3b34fada51cc8dcf.zip | |
Rollup merge of #75353 - estebank:tiny, r=jyn514
Tiny cleanup, remove unnecessary `unwrap` Remove unnecessary `unwrap`.
| -rw-r--r-- | src/librustc_resolve/late/diagnostics.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/librustc_resolve/late/diagnostics.rs b/src/librustc_resolve/late/diagnostics.rs index dcab0858a75..c57c0e51941 100644 --- a/src/librustc_resolve/late/diagnostics.rs +++ b/src/librustc_resolve/late/diagnostics.rs @@ -392,15 +392,15 @@ impl<'a> LateResolutionVisitor<'a, '_, '_> { /// return the span of whole call and the span for all arguments expect the first one (`self`). fn call_has_self_arg(&self, source: PathSource<'_>) -> Option<(Span, Option<Span>)> { let mut has_self_arg = None; - if let PathSource::Expr(parent) = source { - match &parent?.kind { + if let PathSource::Expr(Some(parent)) = source { + match &parent.kind { ExprKind::Call(_, args) if !args.is_empty() => { let mut expr_kind = &args[0].kind; loop { match expr_kind { ExprKind::Path(_, arg_name) if arg_name.segments.len() == 1 => { if arg_name.segments[0].ident.name == kw::SelfLower { - let call_span = parent.unwrap().span; + let call_span = parent.span; let tail_args_span = if args.len() > 1 { Some(Span::new( args[1].span.lo(), |
