Skip to content

Commit 0d213aa

Browse files
committed
Revert "Dogfood double_ended_iterator_last"
This reverts commit 09c5d34.
1 parent 7331cc0 commit 0d213aa

File tree

9 files changed

+10
-10
lines changed

9 files changed

+10
-10
lines changed

clippy_lints/src/attrs/mixed_attributes_style.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ pub(super) fn check(cx: &EarlyContext<'_>, item_span: Span, attrs: &[Attribute])
6666

6767
fn lint_mixed_attrs(cx: &EarlyContext<'_>, attrs: &[Attribute]) {
6868
let mut attrs_iter = attrs.iter().filter(|attr| !attr.span.from_expansion());
69-
let span = if let (Some(first), Some(last)) = (attrs_iter.next(), attrs_iter.next_back()) {
69+
let span = if let (Some(first), Some(last)) = (attrs_iter.next(), attrs_iter.last()) {
7070
first.span.with_hi(last.span.hi())
7171
} else {
7272
return;

clippy_lints/src/collapsible_if.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ fn check_collapsible_maybe_if_let(cx: &EarlyContext<'_>, then_span: Span, else_:
110110
// Prevent "elseif"
111111
// Check that the "else" is followed by whitespace
112112
let up_to_else = then_span.between(block.span);
113-
let requires_space = if let Some(c) = snippet(cx, up_to_else, "..").chars().next_back() {
113+
let requires_space = if let Some(c) = snippet(cx, up_to_else, "..").chars().last() {
114114
!c.is_whitespace()
115115
} else {
116116
false

clippy_lints/src/doc/empty_line_after.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ fn check_gaps(cx: &LateContext<'_>, gaps: &[Gap<'_>]) -> bool {
227227
span_lint_and_then(
228228
cx,
229229
lint,
230-
first_gap.prev_stop.span.to(empty_lines().next_back().unwrap()),
230+
first_gap.prev_stop.span.to(empty_lines().last().unwrap()),
231231
format!("empty {lines} after {kind_desc}"),
232232
|diag| {
233233
if let Some(owner) = cx.last_node_with_lint_attrs.as_owner() {

clippy_lints/src/doc/markdown.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ fn check_word(cx: &LateContext<'_>, word: &str, span: Span, code_level: isize, b
8989

9090
let s = if let Some(prefix) = s.strip_suffix("es")
9191
&& prefix.chars().all(|c| c.is_ascii_uppercase())
92-
&& matches!(prefix.chars().next_back(), Some('S' | 'X'))
92+
&& matches!(prefix.chars().last(), Some('S' | 'X'))
9393
{
9494
prefix
9595
} else if let Some(prefix) = s.strip_suffix("ified")

clippy_lints/src/let_if_seq.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ fn check_assign<'tcx>(
149149
block: &'tcx hir::Block<'_>,
150150
) -> Option<&'tcx hir::Expr<'tcx>> {
151151
if block.expr.is_none()
152-
&& let Some(expr) = block.stmts.iter().next_back()
152+
&& let Some(expr) = block.stmts.iter().last()
153153
&& let hir::StmtKind::Semi(expr) = expr.kind
154154
&& let hir::ExprKind::Assign(var, value, _) = expr.kind
155155
&& path_to_local_id(var, decl)

clippy_lints/src/returns.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ impl<'tcx> LateLintPass<'tcx> for Return {
228228
fn check_block(&mut self, cx: &LateContext<'tcx>, block: &'tcx Block<'_>) {
229229
// we need both a let-binding stmt and an expr
230230
if let Some(retexpr) = block.expr
231-
&& let Some(stmt) = block.stmts.iter().next_back()
231+
&& let Some(stmt) = block.stmts.iter().last()
232232
&& let StmtKind::Let(local) = &stmt.kind
233233
&& local.ty.is_none()
234234
&& cx.tcx.hir().attrs(local.hir_id).is_empty()
@@ -315,7 +315,7 @@ fn check_block_return<'tcx>(cx: &LateContext<'tcx>, expr_kind: &ExprKind<'tcx>,
315315
if let ExprKind::Block(block, _) = expr_kind {
316316
if let Some(block_expr) = block.expr {
317317
check_final_expr(cx, block_expr, semi_spans, RetReplacement::Empty, None);
318-
} else if let Some(stmt) = block.stmts.iter().next_back() {
318+
} else if let Some(stmt) = block.stmts.iter().last() {
319319
match stmt.kind {
320320
StmtKind::Expr(expr) => {
321321
check_final_expr(cx, expr, semi_spans, RetReplacement::Empty, None);

clippy_lints/src/unit_types/unit_arg.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ fn lint_unit_args(cx: &LateContext<'_>, expr: &Expr<'_>, args_to_recover: &[&Exp
7878
.filter_map(|arg| {
7979
if let ExprKind::Block(block, _) = arg.kind
8080
&& block.expr.is_none()
81-
&& let Some(last_stmt) = block.stmts.iter().next_back()
81+
&& let Some(last_stmt) = block.stmts.iter().last()
8282
&& let StmtKind::Semi(last_expr) = last_stmt.kind
8383
&& let Some(snip) = last_expr.span.get_source_text(cx)
8484
{

clippy_lints/src/vec.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ impl UselessVec {
175175
}
176176
},
177177
higher::VecArgs::Vec(args) => {
178-
let args_span = if let Some(last) = args.iter().next_back() {
178+
let args_span = if let Some(last) = args.iter().last() {
179179
if args.len() as u64 * size_of(cx, last) > self.too_large_for_stack {
180180
return;
181181
}

clippy_utils/src/msrvs.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ impl Msrv {
130130
let mut msrv_attrs = attrs.iter().filter(|attr| attr.path_matches(&[sym::clippy, sym_msrv]));
131131

132132
if let Some(msrv_attr) = msrv_attrs.next() {
133-
if let Some(duplicate) = msrv_attrs.next_back() {
133+
if let Some(duplicate) = msrv_attrs.last() {
134134
sess.dcx()
135135
.struct_span_err(duplicate.span(), "`clippy::msrv` is defined multiple times")
136136
.with_span_note(msrv_attr.span(), "first definition found here")

0 commit comments

Comments
 (0)