-
Notifications
You must be signed in to change notification settings - Fork 1.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Auto merge of #9667 - dorublanzeanu:master, r=giraffate
add new lint `seek_to_start_instead_of_rewind ` changelog: `seek_to_start_instead_of_rewind`: new lint to suggest using `rewind` instead of `seek` to start Resolve #8600
- Loading branch information
Showing
10 changed files
with
406 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
45 changes: 45 additions & 0 deletions
45
clippy_lints/src/methods/seek_to_start_instead_of_rewind.rs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,45 @@ | ||
use clippy_utils::diagnostics::span_lint_and_then; | ||
use clippy_utils::ty::implements_trait; | ||
use clippy_utils::{get_trait_def_id, match_def_path, paths}; | ||
use rustc_ast::ast::{LitIntType, LitKind}; | ||
use rustc_errors::Applicability; | ||
use rustc_hir::{Expr, ExprKind}; | ||
use rustc_lint::LateContext; | ||
use rustc_span::Span; | ||
|
||
use super::SEEK_TO_START_INSTEAD_OF_REWIND; | ||
|
||
pub(super) fn check<'tcx>( | ||
cx: &LateContext<'tcx>, | ||
expr: &'tcx Expr<'_>, | ||
recv: &'tcx Expr<'_>, | ||
arg: &'tcx Expr<'_>, | ||
name_span: Span, | ||
) { | ||
// Get receiver type | ||
let ty = cx.typeck_results().expr_ty(recv).peel_refs(); | ||
|
||
if let Some(seek_trait_id) = get_trait_def_id(cx, &paths::STD_IO_SEEK) && | ||
implements_trait(cx, ty, seek_trait_id, &[]) && | ||
let ExprKind::Call(func, args1) = arg.kind && | ||
let ExprKind::Path(ref path) = func.kind && | ||
let Some(def_id) = cx.qpath_res(path, func.hir_id).opt_def_id() && | ||
match_def_path(cx, def_id, &paths::STD_IO_SEEKFROM_START) && | ||
args1.len() == 1 && | ||
let ExprKind::Lit(ref lit) = args1[0].kind && | ||
let LitKind::Int(0, LitIntType::Unsuffixed) = lit.node | ||
{ | ||
let method_call_span = expr.span.with_lo(name_span.lo()); | ||
span_lint_and_then( | ||
cx, | ||
SEEK_TO_START_INSTEAD_OF_REWIND, | ||
method_call_span, | ||
"used `seek` to go to the start of the stream", | ||
|diag| { | ||
let app = Applicability::MachineApplicable; | ||
|
||
diag.span_suggestion(method_call_span, "replace with", "rewind()", app); | ||
}, | ||
); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
### What it does | ||
|
||
Checks for jumps to the start of a stream that implements `Seek` | ||
and uses the `seek` method providing `Start` as parameter. | ||
|
||
### Why is this bad? | ||
|
||
Readability. There is a specific method that was implemented for | ||
this exact scenario. | ||
|
||
### Example | ||
``` | ||
fn foo<T: io::Seek>(t: &mut T) { | ||
t.seek(io::SeekFrom::Start(0)); | ||
} | ||
``` | ||
Use instead: | ||
``` | ||
fn foo<T: io::Seek>(t: &mut T) { | ||
t.rewind(); | ||
} | ||
``` |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,137 @@ | ||
// run-rustfix | ||
#![allow(unused)] | ||
#![feature(custom_inner_attributes)] | ||
#![warn(clippy::seek_to_start_instead_of_rewind)] | ||
|
||
use std::fs::OpenOptions; | ||
use std::io::{Read, Seek, SeekFrom, Write}; | ||
|
||
struct StructWithSeekMethod {} | ||
|
||
impl StructWithSeekMethod { | ||
fn seek(&mut self, from: SeekFrom) {} | ||
} | ||
|
||
trait MySeekTrait { | ||
fn seek(&mut self, from: SeekFrom) {} | ||
} | ||
|
||
struct StructWithSeekTrait {} | ||
impl MySeekTrait for StructWithSeekTrait {} | ||
|
||
// This should NOT trigger clippy warning because | ||
// StructWithSeekMethod does not implement std::io::Seek; | ||
fn seek_to_start_false_method(t: &mut StructWithSeekMethod) { | ||
t.seek(SeekFrom::Start(0)); | ||
} | ||
|
||
// This should NOT trigger clippy warning because | ||
// StructWithSeekMethod does not implement std::io::Seek; | ||
fn seek_to_start_method_owned_false<T>(mut t: StructWithSeekMethod) { | ||
t.seek(SeekFrom::Start(0)); | ||
} | ||
|
||
// This should NOT trigger clippy warning because | ||
// StructWithSeekMethod does not implement std::io::Seek; | ||
fn seek_to_start_false_trait(t: &mut StructWithSeekTrait) { | ||
t.seek(SeekFrom::Start(0)); | ||
} | ||
|
||
// This should NOT trigger clippy warning because | ||
// StructWithSeekMethod does not implement std::io::Seek; | ||
fn seek_to_start_false_trait_owned<T>(mut t: StructWithSeekTrait) { | ||
t.seek(SeekFrom::Start(0)); | ||
} | ||
|
||
// This should NOT trigger clippy warning because | ||
// StructWithSeekMethod does not implement std::io::Seek; | ||
fn seek_to_start_false_trait_bound<T: MySeekTrait>(t: &mut T) { | ||
t.seek(SeekFrom::Start(0)); | ||
} | ||
|
||
// This should trigger clippy warning | ||
fn seek_to_start<T: Seek>(t: &mut T) { | ||
t.rewind(); | ||
} | ||
|
||
// This should trigger clippy warning | ||
fn owned_seek_to_start<T: Seek>(mut t: T) { | ||
t.rewind(); | ||
} | ||
|
||
// This should NOT trigger clippy warning because | ||
// it does not seek to start | ||
fn seek_to_5<T: Seek>(t: &mut T) { | ||
t.seek(SeekFrom::Start(5)); | ||
} | ||
|
||
// This should NOT trigger clippy warning because | ||
// it does not seek to start | ||
fn seek_to_end<T: Seek>(t: &mut T) { | ||
t.seek(SeekFrom::End(0)); | ||
} | ||
|
||
fn main() { | ||
let mut f = OpenOptions::new() | ||
.write(true) | ||
.read(true) | ||
.create(true) | ||
.open("foo.txt") | ||
.unwrap(); | ||
|
||
let mut my_struct_trait = StructWithSeekTrait {}; | ||
seek_to_start_false_trait_bound(&mut my_struct_trait); | ||
|
||
let hello = "Hello!\n"; | ||
write!(f, "{hello}").unwrap(); | ||
seek_to_5(&mut f); | ||
seek_to_end(&mut f); | ||
seek_to_start(&mut f); | ||
|
||
let mut buf = String::new(); | ||
f.read_to_string(&mut buf).unwrap(); | ||
|
||
assert_eq!(&buf, hello); | ||
} | ||
|
||
fn msrv_1_54() { | ||
#![clippy::msrv = "1.54"] | ||
|
||
let mut f = OpenOptions::new() | ||
.write(true) | ||
.read(true) | ||
.create(true) | ||
.open("foo.txt") | ||
.unwrap(); | ||
|
||
let hello = "Hello!\n"; | ||
write!(f, "{hello}").unwrap(); | ||
|
||
f.seek(SeekFrom::Start(0)); | ||
|
||
let mut buf = String::new(); | ||
f.read_to_string(&mut buf).unwrap(); | ||
|
||
assert_eq!(&buf, hello); | ||
} | ||
|
||
fn msrv_1_55() { | ||
#![clippy::msrv = "1.55"] | ||
|
||
let mut f = OpenOptions::new() | ||
.write(true) | ||
.read(true) | ||
.create(true) | ||
.open("foo.txt") | ||
.unwrap(); | ||
|
||
let hello = "Hello!\n"; | ||
write!(f, "{hello}").unwrap(); | ||
|
||
f.rewind(); | ||
|
||
let mut buf = String::new(); | ||
f.read_to_string(&mut buf).unwrap(); | ||
|
||
assert_eq!(&buf, hello); | ||
} |
Oops, something went wrong.