diff options
| author | Camille GILLOT <gillot.camille@gmail.com> | 2021-09-10 19:57:06 +0200 |
|---|---|---|
| committer | Camille GILLOT <gillot.camille@gmail.com> | 2021-09-11 17:52:39 +0200 |
| commit | ce1da849b04bfa3847fbb4130424cac8cd51a227 (patch) | |
| tree | 54d2997d73af25a3c1614d78c405a0f8ec9c5794 | |
| parent | 11e2966f3fcac861977d594eb77240638a3a2042 (diff) | |
| download | rust-ce1da849b04bfa3847fbb4130424cac8cd51a227.tar.gz rust-ce1da849b04bfa3847fbb4130424cac8cd51a227.zip | |
Rebase fallout.
| -rw-r--r-- | clippy_lints/src/methods/manual_split_once.rs | 2 | ||||
| -rw-r--r-- | clippy_lints/src/module_style.rs | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/clippy_lints/src/methods/manual_split_once.rs b/clippy_lints/src/methods/manual_split_once.rs index e273186d051..00167650324 100644 --- a/clippy_lints/src/methods/manual_split_once.rs +++ b/clippy_lints/src/methods/manual_split_once.rs @@ -182,7 +182,7 @@ fn parse_iter_usage( }, _, ) => { - let parent_span = e.span.parent().unwrap(); + let parent_span = e.span.parent_callsite().unwrap(); if parent_span.ctxt() == ctxt { (Some(UnwrapKind::QuestionMark), parent_span) } else { diff --git a/clippy_lints/src/module_style.rs b/clippy_lints/src/module_style.rs index 80a930d0c54..f351d0098b7 100644 --- a/clippy_lints/src/module_style.rs +++ b/clippy_lints/src/module_style.rs @@ -120,7 +120,7 @@ impl EarlyLintPass for ModStyle { correct.push("mod.rs"); cx.struct_span_lint( SELF_NAMED_MODULE_FILES, - Span::new(file.start_pos, file.start_pos, SyntaxContext::root()), + Span::new(file.start_pos, file.start_pos, SyntaxContext::root(), None), |build| { let mut lint = build.build(&format!("`mod.rs` files are required, found `{}`", path.display())); @@ -167,7 +167,7 @@ fn check_self_named_mod_exists(cx: &EarlyContext<'_>, path: &Path, file: &Source cx.struct_span_lint( MOD_MODULE_FILES, - Span::new(file.start_pos, file.start_pos, SyntaxContext::root()), + Span::new(file.start_pos, file.start_pos, SyntaxContext::root(), None), |build| { let mut lint = build.build(&format!("`mod.rs` files are not allowed, found `{}`", path.display())); lint.help(&format!("move `{}` to `{}`", path.display(), mod_file.display(),)); |