From cd4bf7fb8e2f1c4baa7863bd87d3a1a3e1c758a3 Mon Sep 17 00:00:00 2001
From: Vadim Petrochenkov <vadim.petrochenkov@gmail.com>
Date: Sat, 21 Aug 2021 18:07:21 +0300
Subject: [PATCH] cleanup: `Span::new` -> `Span::with_lo`
---
clippy_lints/src/unit_return_expecting_ord.rs | 2 +-
clippy_lints/src/write.rs | 2 +-
clippy_utils/src/lib.rs | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/clippy_lints/src/unit_return_expecting_ord.rs b/clippy_lints/src/unit_return_expecting_ord.rs
index ee675838c4c..db0f412f2a1 100644
--- a/clippy_lints/src/unit_return_expecting_ord.rs
+++ b/clippy_lints/src/unit_return_expecting_ord.rs
@@ -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))
}
diff --git a/clippy_lints/src/write.rs b/clippy_lints/src/write.rs
index 4553ac704a2..85d1f65c51f 100644
--- a/clippy_lints/src/write.rs
+++ b/clippy_lints/src/write.rs
@@ -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(
diff --git a/clippy_utils/src/lib.rs b/clippy_utils/src/lib.rs
index 82bfce8fe78..0da86a76d39 100644
--- a/clippy_utils/src/lib.rs
+++ b/clippy_utils/src/lib.rs
@@ -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.