Skip to content

Commit d67c00f

Browse files
committed
Dogfood double_ended_iterator_last
1 parent 0d213aa commit d67c00f

3 files changed

Lines changed: 3 additions & 3 deletions

File tree

‎clippy_lints/src/attrs/mixed_attributes_style.rs‎

Lines changed: 1 addition & 1 deletion
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
fnlint_mixed_attrs(cx:&EarlyContext<'_>,attrs:&[Attribute]){
6868
letmut attrs_iter = attrs.iter().filter(|attr| !attr.span.from_expansion());
69-
let span = iflet(Some(first),Some(last)) = (attrs_iter.next(), attrs_iter.last()){
69+
let span = iflet(Some(first),Some(last)) = (attrs_iter.next(), attrs_iter.next_back()){
7070
first.span.with_hi(last.span.hi())
7171
}else{
7272
return;

‎clippy_lints/src/methods/double_ended_iterator_last.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ pub(super) fn check(cx: &LateContext<'_>, expr: &'_ Expr<'_>, self_expr: &'_ Exp
2424
&& letOk(Some(fn_def)) = Instance::try_resolve(cx.tcx, cx.typing_env(), id, args)
2525
// find the provided definition of Iterator::last
2626
&& letSome(item) = cx.tcx.get_diagnostic_item(sym::Iterator)
27-
&& letSome(last_def) = cx.tcx.provided_trait_methods(item).find(|m| m.name == sym!(last))
27+
&& letSome(last_def) = cx.tcx.provided_trait_methods(item).find(|m| m.name.as_str() == "last")
2828
// if the resolved method is the same as the provided definition
2929
&& fn_def.def_id() == last_def.def_id
3030
{

‎clippy_utils/src/msrvs.rs‎

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

132132
ifletSome(msrv_attr) = msrv_attrs.next(){
133-
ifletSome(duplicate) = msrv_attrs.last(){
133+
ifletSome(duplicate) = msrv_attrs.next_back(){
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)