squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Rollup merge of #75353 - estebank:tiny, r=jyn514

Browse source 
Tiny cleanup, remove unnecessary `unwrap`

Remove unnecessary `unwrap`.
This commit is contained in:
Yuki Okushi 2020-08-11 16:23:56 +09:00 committed by GitHub
commit 0a8d4db4d8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/librustc_resolve/late/diagnostics.rs
View file

@ -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(),