Skip to content

Commit fe2fe7f

Browse files
borsbors
committed
Auto merge of rust-lang#12972 - Jarcho:span_ex, r=Manishearth
Add new span related utils The none-generic versions of the functions exist to help with both compile times and codegen. changelog: None
2 parents 3e84ca8 + 4baae5d commit fe2fe7f

File tree

15 files changed

+296
-156
lines changed

15 files changed

+296
-156
lines changed

‎clippy_lints/src/cognitive_complexity.rs‎

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//! calculate cognitive complexity and warn about overly complex functions
22
33
use clippy_utils::diagnostics::span_lint_and_help;
4-
use clippy_utils::source::snippet_opt;
4+
use clippy_utils::source::{IntoSpan, SpanRangeExt};
55
use clippy_utils::ty::is_type_diagnostic_item;
66
use clippy_utils::visitors::for_each_expr_without_closures;
77
use clippy_utils::{get_async_fn_body, is_async_fn, LimitStack};
@@ -12,7 +12,7 @@ use rustc_hir::{Body, Expr, ExprKind, FnDecl};
1212
use rustc_lint::{LateContext, LateLintPass, LintContext};
1313
use rustc_session::impl_lint_pass;
1414
use rustc_span::def_id::LocalDefId;
15-
use rustc_span::{sym, BytePos, Span};
15+
use rustc_span::{sym, Span};
1616

1717
declare_clippy_lint! {
1818
/// ### What it does
@@ -50,7 +50,6 @@ impl CognitiveComplexity {
5050
impl_lint_pass!(CognitiveComplexity => [COGNITIVE_COMPLEXITY]);
5151

5252
impl CognitiveComplexity {
53-
#[expect(clippy::cast_possible_truncation)]
5453
fn check<'tcx>(
5554
&mut self,
5655
cx: &LateContext<'tcx>,
@@ -100,17 +99,12 @@ impl CognitiveComplexity {
10099
FnKind::ItemFn(ident, _, _) | FnKind::Method(ident, _) => ident.span,
101100
FnKind::Closure => {
102101
let header_span = body_span.with_hi(decl.output.span().lo());
103-
let pos = snippet_opt(cx, header_span).and_then(|snip| {
104-
let low_offset = snip.find('|')?;
105-
let high_offset = 1 + snip.get(low_offset + 1..)?.find('|')?;
106-
let low = header_span.lo() + BytePos(low_offset as u32);
107-
let high = low + BytePos(high_offset as u32 + 1);
108-
109-
Some((low, high))
110-
});
111-
112-
if let Some((low, high)) = pos {
113-
Span::new(low, high, header_span.ctxt(), header_span.parent())
102+
#[expect(clippy::range_plus_one)]
103+
if let Some(range) = header_span.map_range(cx, |src, range| {
104+
let mut idxs = src.get(range.clone())?.match_indices('|');
105+
Some(range.start + idxs.next()?.0..range.start + idxs.next()?.0 + 1)
106+
}) {
107+
range.with_ctxt(header_span.ctxt())
114108
} else {
115109
return;
116110
}

‎clippy_lints/src/copies.rs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use clippy_utils::diagnostics::{span_lint_and_note, span_lint_and_then};
2-
use clippy_utils::source::{first_line_of_span, indent_of, reindent_multiline, snippet, snippet_opt};
2+
use clippy_utils::source::{first_line_of_span, indent_of, reindent_multiline, snippet, IntoSpan, SpanRangeExt};
33
use clippy_utils::ty::{needs_ordered_drop, InteriorMut};
44
use clippy_utils::visitors::for_each_expr_without_closures;
55
use clippy_utils::{
@@ -14,7 +14,7 @@ use rustc_lint::{LateContext, LateLintPass};
1414
use rustc_session::impl_lint_pass;
1515
use rustc_span::hygiene::walk_chain;
1616
use rustc_span::source_map::SourceMap;
17-
use rustc_span::{BytePos, Span, Symbol};
17+
use rustc_span::{Span, Symbol};
1818
use std::borrow::Cow;
1919

2020
declare_clippy_lint! {
@@ -266,12 +266,12 @@ fn lint_branches_sharing_code<'tcx>(
266266

267267
let span = span.with_hi(last_block.span.hi());
268268
// Improve formatting if the inner block has indention (i.e. normal Rust formatting)
269-
let test_span = Span::new(span.lo() - BytePos(4), span.lo(), span.ctxt(), span.parent());
270-
let span = if snippet_opt(cx, test_span).map_or(false, |snip| snip == " ") {
271-
span.with_lo(test_span.lo())
272-
} else {
273-
span
274-
};
269+
let span = span
270+
.map_range(cx, |src, range| {
271+
(range.start > 4 && src.get(range.start - 4..range.start)? == " ")
272+
.then_some(range.start - 4..range.end)
273+
})
274+
.map_or(span, |range| range.with_ctxt(span.ctxt()));
275275
(span, suggestion.to_string())
276276
});
277277

‎clippy_lints/src/implicit_hasher.rs‎

Lines changed: 17 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ use rustc_span::symbol::sym;
1414
use rustc_span::Span;
1515

1616
use clippy_utils::diagnostics::{multispan_sugg, span_lint_and_then};
17-
use clippy_utils::source::{snippet, snippet_opt};
17+
use clippy_utils::source::{snippet, IntoSpan, SpanRangeExt};
1818
use clippy_utils::ty::is_type_diagnostic_item;
1919

2020
declare_clippy_lint! {
@@ -59,10 +59,8 @@ declare_clippy_lint! {
5959
declare_lint_pass!(ImplicitHasher => [IMPLICIT_HASHER]);
6060

6161
impl<'tcx> LateLintPass<'tcx> for ImplicitHasher {
62-
#[expect(clippy::cast_possible_truncation, clippy::too_many_lines)]
62+
#[expect(clippy::too_many_lines)]
6363
fn check_item(&mut self, cx: &LateContext<'tcx>, item: &'tcx Item<'_>) {
64-
use rustc_span::BytePos;
65-
6664
fn suggestion(
6765
cx: &LateContext<'_>,
6866
diag: &mut Diag<'_, ()>,
@@ -123,10 +121,11 @@ impl<'tcx> LateLintPass<'tcx> for ImplicitHasher {
123121
}
124122

125123
let generics_suggestion_span = impl_.generics.span.substitute_dummy({
126-
let pos = snippet_opt(cx, item.span.until(target.span()))
127-
.and_then(|snip| Some(item.span.lo() + BytePos(snip.find("impl")? as u32 + 4)));
128-
if let Some(pos) = pos {
129-
Span::new(pos, pos, item.span.ctxt(), item.span.parent())
124+
let range = (item.span.lo()..target.span().lo()).map_range(cx, |src, range| {
125+
Some(src.get(range.clone())?.find("impl")? + 4..range.end)
126+
});
127+
if let Some(range) = range {
128+
range.with_ctxt(item.span.ctxt())
130129
} else {
131130
return;
132131
}
@@ -163,21 +162,16 @@ impl<'tcx> LateLintPass<'tcx> for ImplicitHasher {
163162
continue;
164163
}
165164
let generics_suggestion_span = generics.span.substitute_dummy({
166-
let pos = snippet_opt(
167-
cx,
168-
Span::new(
169-
item.span.lo(),
170-
body.params[0].pat.span.lo(),
171-
item.span.ctxt(),
172-
item.span.parent(),
173-
),
174-
)
175-
.and_then(|snip| {
176-
let i = snip.find("fn")?;
177-
Some(item.span.lo() + BytePos((i + snip[i..].find('(')?) as u32))
178-
})
179-
.expect("failed to create span for type parameters");
180-
Span::new(pos, pos, item.span.ctxt(), item.span.parent())
165+
let range = (item.span.lo()..body.params[0].pat.span.lo()).map_range(cx, |src, range| {
166+
let (pre, post) = src.get(range.clone())?.split_once("fn")?;
167+
let pos = post.find('(')? + pre.len() + 2;
168+
Some(pos..pos)
169+
});
170+
if let Some(range) = range {
171+
range.with_ctxt(item.span.ctxt())
172+
} else {
173+
return;
174+
}
181175
});
182176

183177
let mut ctr_vis = ImplicitHasherConstructorVisitor::new(cx, target);

‎clippy_lints/src/matches/single_match.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use clippy_utils::diagnostics::span_lint_and_sugg;
2-
use clippy_utils::source::{expr_block, get_source_text, snippet};
2+
use clippy_utils::source::{expr_block, snippet, SpanRangeExt};
33
use clippy_utils::ty::{implements_trait, is_type_diagnostic_item, peel_mid_ty_refs};
44
use clippy_utils::{is_lint_allowed, is_unit_expr, is_wild, peel_blocks, peel_hir_pat_refs, peel_n_hir_expr_refs};
55
use core::cmp::max;
@@ -17,7 +17,7 @@ use super::{MATCH_BOOL, SINGLE_MATCH, SINGLE_MATCH_ELSE};
1717
/// span, e.g. a string literal `"//"`, but we know that this isn't the case for empty
1818
/// match arms.
1919
fn empty_arm_has_comment(cx: &LateContext<'_>, span: Span) -> bool {
20-
if let Some(ff) = get_source_text(cx, span)
20+
if let Some(ff) = span.get_source_text(cx)
2121
&& let Some(text) = ff.as_str()
2222
{
2323
text.as_bytes().windows(2).any(|w| w == b"//" || w == b"/*")

‎clippy_lints/src/methods/manual_inspect.rs‎

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use clippy_config::msrvs::{self, Msrv};
22
use clippy_utils::diagnostics::span_lint_and_then;
3-
use clippy_utils::source::{get_source_text, with_leading_whitespace, SpanRange};
3+
use clippy_utils::source::{IntoSpan, SpanRangeExt};
44
use clippy_utils::ty::get_field_by_name;
55
use clippy_utils::visitors::{for_each_expr, for_each_expr_without_closures};
66
use clippy_utils::{expr_use_ctxt, is_diag_item_method, is_diag_trait_item, path_to_local_id, ExprUseNode};
@@ -9,7 +9,7 @@ use rustc_errors::Applicability;
99
use rustc_hir::{BindingMode, BorrowKind, ByRef, ClosureKind, Expr, ExprKind, Mutability, Node, PatKind};
1010
use rustc_lint::LateContext;
1111
use rustc_middle::ty::adjustment::{Adjust, Adjustment, AutoBorrow, AutoBorrowMutability};
12-
use rustc_span::{sym, BytePos, Span, Symbol, DUMMY_SP};
12+
use rustc_span::{sym, Span, Symbol, DUMMY_SP};
1313

1414
use super::MANUAL_INSPECT;
1515

@@ -98,17 +98,19 @@ pub(crate) fn check(cx: &LateContext<'_>, expr: &Expr<'_>, arg: &Expr<'_>, name:
9898
let mut addr_of_edits = Vec::with_capacity(delayed.len());
9999
for x in delayed {
100100
match x {
101-
UseKind::Return(s) => edits.push((with_leading_whitespace(cx, s).set_span_pos(s), String::new())),
101+
UseKind::Return(s) => edits.push((s.with_leading_whitespace(cx).with_ctxt(s.ctxt()), String::new())),
102102
UseKind::Borrowed(s) => {
103-
if let Some(src) = get_source_text(cx, s)
104-
&& let Some(src) = src.as_str()
105-
&& let trim_src = src.trim_start_matches([' ', '\t', '\n', '\r', '('])
106-
&& trim_src.starts_with('&')
107-
{
108-
let range = s.into_range();
109-
#[expect(clippy::cast_possible_truncation)]
110-
let start = BytePos(range.start.0 + (src.len() - trim_src.len()) as u32);
111-
addr_of_edits.push(((start..BytePos(start.0 + 1)).set_span_pos(s), String::new()));
103+
#[expect(clippy::range_plus_one)]
104+
let range = s.map_range(cx, |src, range| {
105+
let src = src.get(range.clone())?;
106+
let trimmed = src.trim_start_matches([' ', '\t', '\n', '\r', '(']);
107+
trimmed.starts_with('&').then(|| {
108+
let pos = range.start + src.len() - trimmed.len();
109+
pos..pos + 1
110+
})
111+
});
112+
if let Some(range) = range {
113+
addr_of_edits.push((range.with_ctxt(s.ctxt()), String::new()));
112114
} else {
113115
requires_copy = true;
114116
requires_deref = true;
@@ -174,7 +176,10 @@ pub(crate) fn check(cx: &LateContext<'_>, expr: &Expr<'_>, arg: &Expr<'_>, name:
174176
}),
175177
));
176178
edits.push((
177-
with_leading_whitespace(cx, final_expr.span).set_span_pos(final_expr.span),
179+
final_expr
180+
.span
181+
.with_leading_whitespace(cx)
182+
.with_ctxt(final_expr.span.ctxt()),
178183
String::new(),
179184
));
180185
let app = if edits.iter().any(|(s, _)| s.from_expansion()) {

‎clippy_lints/src/missing_doc.rs‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
use clippy_utils::attrs::is_doc_hidden;
99
use clippy_utils::diagnostics::span_lint;
1010
use clippy_utils::is_from_proc_macro;
11-
use clippy_utils::source::snippet_opt;
11+
use clippy_utils::source::SpanRangeExt;
1212
use rustc_ast::ast::{self, MetaItem, MetaItemKind};
1313
use rustc_hir as hir;
1414
use rustc_hir::def_id::LocalDefId;
@@ -266,8 +266,5 @@ impl<'tcx> LateLintPass<'tcx> for MissingDoc {
266266
}
267267

268268
fn span_to_snippet_contains_docs(cx: &LateContext<'_>, search_span: Span) -> bool {
269-
let Some(snippet) = snippet_opt(cx, search_span) else {
270-
return false;
271-
};
272-
snippet.lines().rev().any(|line| line.trim().starts_with("///"))
269+
search_span.check_source_text(cx, |src| src.lines().rev().any(|line| line.trim().starts_with("///")))
273270
}

‎clippy_lints/src/multiple_bound_locations.rs‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use rustc_session::declare_lint_pass;
66
use rustc_span::Span;
77

88
use clippy_utils::diagnostics::span_lint;
9-
use clippy_utils::source::snippet_opt;
9+
use clippy_utils::source::SpanRangeExt;
1010

1111
declare_clippy_lint! {
1212
/// ### What it does
@@ -54,8 +54,10 @@ impl EarlyLintPass for MultipleBoundLocations {
5454
match clause {
5555
WherePredicate::BoundPredicate(pred) => {
5656
if (!pred.bound_generic_params.is_empty() || !pred.bounds.is_empty())
57-
&& let Some(name) = snippet_opt(cx, pred.bounded_ty.span)
58-
&& let Some(bound_span) = generic_params_with_bounds.get(name.as_str())
57+
&& let Some(Some(bound_span)) = pred
58+
.bounded_ty
59+
.span
60+
.with_source_text(cx, |src| generic_params_with_bounds.get(src))
5961
{
6062
emit_lint(cx, *bound_span, pred.bounded_ty.span);
6163
}

‎clippy_lints/src/needless_else.rs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
use clippy_utils::diagnostics::span_lint_and_sugg;
2-
use clippy_utils::source::{snippet_opt, trim_span};
2+
use clippy_utils::source::{IntoSpan, SpanRangeExt};
33
use rustc_ast::ast::{Expr, ExprKind};
44
use rustc_errors::Applicability;
5-
use rustc_lint::{EarlyContext, EarlyLintPass, LintContext};
5+
use rustc_lint::{EarlyContext, EarlyLintPass};
66
use rustc_session::declare_lint_pass;
77

88
declare_clippy_lint! {
@@ -41,16 +41,16 @@ impl EarlyLintPass for NeedlessElse {
4141
&& !expr.span.from_expansion()
4242
&& !else_clause.span.from_expansion()
4343
&& block.stmts.is_empty()
44-
&& let Some(trimmed) = expr.span.trim_start(then_block.span)
45-
&& let span = trim_span(cx.sess().source_map(), trimmed)
46-
&& let Some(else_snippet) = snippet_opt(cx, span)
47-
// Ignore else blocks that contain comments or #[cfg]s
48-
&& !else_snippet.contains(['/', '#'])
44+
&& let range = (then_block.span.hi()..expr.span.hi()).trim_start(cx)
45+
&& range.clone().check_source_text(cx, |src| {
46+
// Ignore else blocks that contain comments or #[cfg]s
47+
!src.contains(['/', '#'])
48+
})
4949
{
5050
span_lint_and_sugg(
5151
cx,
5252
NEEDLESS_ELSE,
53-
span,
53+
range.with_ctxt(expr.span.ctxt()),
5454
"this `else` branch is empty",
5555
"you can remove it",
5656
String::new(),

‎clippy_lints/src/needless_if.rs‎

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use clippy_utils::diagnostics::span_lint_and_sugg;
22
use clippy_utils::higher::If;
33
use clippy_utils::is_from_proc_macro;
4-
use clippy_utils::source::snippet_opt;
4+
use clippy_utils::source::{snippet_opt, SpanRangeExt};
55
use rustc_errors::Applicability;
66
use rustc_hir::{ExprKind, Stmt, StmtKind};
77
use rustc_lint::{LateContext, LateLintPass, LintContext};
@@ -39,18 +39,24 @@ declare_lint_pass!(NeedlessIf => [NEEDLESS_IF]);
3939
impl LateLintPass<'_> for NeedlessIf {
4040
fn check_stmt<'tcx>(&mut self, cx: &LateContext<'tcx>, stmt: &Stmt<'tcx>) {
4141
if let StmtKind::Expr(expr) = stmt.kind
42-
&& let Some(If {cond, then, r#else: None }) = If::hir(expr)
42+
&& let Some(If {
43+
cond,
44+
then,
45+
r#else: None,
46+
}) = If::hir(expr)
4347
&& let ExprKind::Block(block, ..) = then.kind
4448
&& block.stmts.is_empty()
4549
&& block.expr.is_none()
4650
&& !in_external_macro(cx.sess(), expr.span)
47-
&& let Some(then_snippet) = snippet_opt(cx, then.span)
48-
// Ignore
49-
// - empty macro expansions
50-
// - empty reptitions in macro expansions
51-
// - comments
52-
// - #[cfg]'d out code
53-
&& then_snippet.chars().all(|ch| matches!(ch, '{' | '}') || ch.is_ascii_whitespace())
51+
&& then.span.check_source_text(cx, |src| {
52+
// Ignore
53+
// - empty macro expansions
54+
// - empty reptitions in macro expansions
55+
// - comments
56+
// - #[cfg]'d out code
57+
src.bytes()
58+
.all(|ch| matches!(ch, b'{' | b'}') || ch.is_ascii_whitespace())
59+
})
5460
&& let Some(cond_snippet) = snippet_opt(cx, cond.span)
5561
&& !is_from_proc_macro(cx, expr)
5662
{

‎clippy_lints/src/non_octal_unix_permissions.rs‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use clippy_utils::diagnostics::span_lint_and_sugg;
2-
use clippy_utils::source::{snippet_opt, snippet_with_applicability};
2+
use clippy_utils::source::{snippet_with_applicability, SpanRangeExt};
33
use clippy_utils::{match_def_path, paths};
44
use rustc_errors::Applicability;
55
use rustc_hir::{Expr, ExprKind};
@@ -53,8 +53,9 @@ impl<'tcx> LateLintPass<'tcx> for NonOctalUnixPermissions {
5353
&& cx.tcx.is_diagnostic_item(sym::FsPermissions, adt.did())))
5454
&& let ExprKind::Lit(_) = param.kind
5555
&& param.span.eq_ctxt(expr.span)
56-
&& let Some(snip) = snippet_opt(cx, param.span)
57-
&& !(snip.starts_with("0o") || snip.starts_with("0b"))
56+
&& param
57+
.span
58+
.check_source_text(cx, |src| !matches!(src.as_bytes(), [b'0', b'o' | b'b', ..]))
5859
{
5960
show_error(cx, param);
6061
}
@@ -65,8 +66,9 @@ impl<'tcx> LateLintPass<'tcx> for NonOctalUnixPermissions {
6566
&& match_def_path(cx, def_id, &paths::PERMISSIONS_FROM_MODE)
6667
&& let ExprKind::Lit(_) = param.kind
6768
&& param.span.eq_ctxt(expr.span)
68-
&& let Some(snip) = snippet_opt(cx, param.span)
69-
&& !(snip.starts_with("0o") || snip.starts_with("0b"))
69+
&& param
70+
.span
71+
.check_source_text(cx, |src| !matches!(src.as_bytes(), [b'0', b'o' | b'b', ..]))
7072
{
7173
show_error(cx, param);
7274
}

0 commit comments

Comments
 (0)