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

cleanup: Span::new -> Span::with_lo

Browse source
This commit is contained in:
Vadim Petrochenkov 2021-08-21 18:07:21 +03:00
parent db002a06ae
commit 1df0b73196
5 changed files with 6 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
compiler/rustc_middle/src/middle/region.rs
View file

@ -189,7 +189,7 @@ impl Scope {
// To avoid issues with macro-generated spans, the span
// of the statement must be nested in that of the block.
if span.lo() <= stmt_span.lo() && stmt_span.lo() <= span.hi() {
return Span::new(stmt_span.lo(), span.hi(), span.ctxt());
return span.with_lo(stmt_span.lo());
}
}
}

12
compiler/rustc_typeck/src/check/compare_method.rs
View file

@ -708,11 +708,7 @@ fn compare_number_of_method_arguments<'tcx>(
Some(if pos == 0 {
arg.span
} else {
Span::new(
trait_m_sig.decl.inputs[0].span.lo(),
arg.span.hi(),
arg.span.ctxt(),
)
arg.span.with_lo(trait_m_sig.decl.inputs[0].span.lo())
})
} else {
trait_item_span
@ -731,11 +727,7 @@ fn compare_number_of_method_arguments<'tcx>(
if pos == 0 {
arg.span
} else {
Span::new(
impl_m_sig.decl.inputs[0].span.lo(),
arg.span.hi(),
arg.span.ctxt(),
)
arg.span.with_lo(impl_m_sig.decl.inputs[0].span.lo())
}
} else {
impl_m_span

2
src/tools/clippy/clippy_lints/src/unit_return_expecting_ord.rs
View file

@ -127,7 +127,7 @@ fn check_arg<'tcx>(cx: &LateContext<'tcx>, arg: &'tcx Expr<'tcx>) -> Option<(Spa
then {
let data = stmt.span.data();
// Make a span out of the semicolon for the help message
Some((span, Some(Span::new(data.hi-BytePos(1), data.hi, data.ctxt))))
Some((span, Some(data.with_lo(data.hi-BytePos(1)))))
} else {
Some((span, None))
}

2
src/tools/clippy/clippy_lints/src/write.rs
View file

@ -299,7 +299,7 @@ impl EarlyLintPass for Write {
let nl_span = match (dest, only_nl) {
// Special case of `write!(buf, "\n")`: Mark everything from the end of
// `buf` for removal so no trailing comma [`writeln!(buf, )`] remains.
(Some(dest_expr), true) => Span::new(dest_expr.span.hi(), nl_span.hi(), nl_span.ctxt()),
(Some(dest_expr), true) => nl_span.with_lo(dest_expr.span.hi()),
_ => nl_span,
};
span_lint_and_then(

2
src/tools/clippy/clippy_utils/src/lib.rs
View file

@ -877,7 +877,7 @@ fn line_span<T: LintContext>(cx: &T, span: Span) -> Span {
let source_map_and_line = cx.sess().source_map().lookup_line(span.lo()).unwrap();
let line_no = source_map_and_line.line;
let line_start = source_map_and_line.sf.lines[line_no];
Span::new(line_start, span.hi(), span.ctxt())
span.with_lo(line_start)
}
/// Gets the parent node, if any.