diff options
| author | Vadim Petrochenkov <vadim.petrochenkov@gmail.com> | 2024-01-02 23:32:40 +0300 |
|---|---|---|
| committer | Vadim Petrochenkov <vadim.petrochenkov@gmail.com> | 2024-01-06 01:25:20 +0300 |
| commit | e10a05dff3f278f89dc4bce7fb9cbafc40767d49 (patch) | |
| tree | 1925651c1734f0fa7a7aaf38508021fe1ad58b3c | |
| parent | d2012259ca219d92b94b724767919bb8c17c3013 (diff) | |
| download | rust-e10a05dff3f278f89dc4bce7fb9cbafc40767d49.tar.gz rust-e10a05dff3f278f89dc4bce7fb9cbafc40767d49.zip | |
rustc_span: Optimize syntax context comparisons
Including comparisons with root context
| -rw-r--r-- | clippy_lints/src/casts/unnecessary_cast.rs | 2 | ||||
| -rw-r--r-- | clippy_lints/src/implicit_hasher.rs | 2 | ||||
| -rw-r--r-- | clippy_lints/src/implicit_return.rs | 2 | ||||
| -rw-r--r-- | clippy_lints/src/methods/option_map_unwrap_or.rs | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/clippy_lints/src/casts/unnecessary_cast.rs b/clippy_lints/src/casts/unnecessary_cast.rs index 849920bb76d..3761ba81f52 100644 --- a/clippy_lints/src/casts/unnecessary_cast.rs +++ b/clippy_lints/src/casts/unnecessary_cast.rs @@ -145,7 +145,7 @@ pub(super) fn check<'tcx>( if cast_from.kind() == cast_to.kind() && !in_external_macro(cx.sess(), expr.span) { if let Some(id) = path_to_local(cast_expr) && let Some(span) = cx.tcx.hir().opt_span(id) - && span.ctxt() != cast_expr.span.ctxt() + && !span.eq_ctxt(cast_expr.span) { // Binding context is different than the identifiers context. // Weird macro wizardry could be involved here. diff --git a/clippy_lints/src/implicit_hasher.rs b/clippy_lints/src/implicit_hasher.rs index 43eb6a9b838..788fe828727 100644 --- a/clippy_lints/src/implicit_hasher.rs +++ b/clippy_lints/src/implicit_hasher.rs @@ -118,7 +118,7 @@ impl<'tcx> LateLintPass<'tcx> for ImplicitHasher { vis.visit_ty(impl_.self_ty); for target in &vis.found { - if item.span.ctxt() != target.span().ctxt() { + if !item.span.eq_ctxt(target.span()) { return; } diff --git a/clippy_lints/src/implicit_return.rs b/clippy_lints/src/implicit_return.rs index d68c5c4bac6..5288efd8df8 100644 --- a/clippy_lints/src/implicit_return.rs +++ b/clippy_lints/src/implicit_return.rs @@ -225,7 +225,7 @@ impl<'tcx> LateLintPass<'tcx> for ImplicitReturn { _: LocalDefId, ) { if (!matches!(kind, FnKind::Closure) && matches!(decl.output, FnRetTy::DefaultReturn(_))) - || span.ctxt() != body.value.span.ctxt() + || !span.eq_ctxt(body.value.span) || in_external_macro(cx.sess(), span) { return; diff --git a/clippy_lints/src/methods/option_map_unwrap_or.rs b/clippy_lints/src/methods/option_map_unwrap_or.rs index 63e64a5b35d..47c9438c588 100644 --- a/clippy_lints/src/methods/option_map_unwrap_or.rs +++ b/clippy_lints/src/methods/option_map_unwrap_or.rs @@ -67,7 +67,7 @@ pub(super) fn check<'tcx>( } } - if unwrap_arg.span.ctxt() != map_span.ctxt() { + if !unwrap_arg.span.eq_ctxt(map_span) { return; } |