mirror of
https://github.com/rust-lang/rust-clippy
synced 2024-11-15 09:27:25 +00:00
Combine doc examples
This commit is contained in:
parent
adafb6c416
commit
b20f95c1a1
11 changed files with 88 additions and 110 deletions
|
@ -32,12 +32,11 @@ declare_clippy_lint! {
|
|||
/// Use instead:
|
||||
/// ```rust,ignore
|
||||
/// f(a.try_into()?);
|
||||
/// ```
|
||||
/// or
|
||||
/// ```rust,ignore
|
||||
///
|
||||
/// // or
|
||||
///
|
||||
/// f(a.try_into().expect("Unexpected u16 overflow in f"));
|
||||
/// ```
|
||||
///
|
||||
#[clippy::version = "1.41.0"]
|
||||
pub AS_CONVERSIONS,
|
||||
restriction,
|
||||
|
|
|
@ -241,13 +241,13 @@ declare_clippy_lint! {
|
|||
///
|
||||
/// Use instead:
|
||||
/// ```rust
|
||||
/// # mod hidden {
|
||||
/// #[cfg(target_os = "linux")]
|
||||
/// fn conditional() { }
|
||||
/// ```
|
||||
/// # }
|
||||
///
|
||||
/// or
|
||||
/// // or
|
||||
///
|
||||
/// ```rust
|
||||
/// #[cfg(unix)]
|
||||
/// fn conditional() { }
|
||||
/// ```
|
||||
|
|
|
@ -22,21 +22,17 @@ declare_clippy_lint! {
|
|||
///
|
||||
/// ### Examples
|
||||
/// ```rust
|
||||
/// // Bad
|
||||
/// # fn somefunc() -> bool { true };
|
||||
/// if { true } { /* ... */ }
|
||||
///
|
||||
/// // Good
|
||||
/// if true { /* ... */ }
|
||||
/// if { let x = somefunc(); x } { /* ... */ }
|
||||
/// ```
|
||||
///
|
||||
/// or
|
||||
///
|
||||
/// Use instead:
|
||||
/// ```rust
|
||||
/// # fn somefunc() -> bool { true };
|
||||
/// // Bad
|
||||
/// if { let x = somefunc(); x } { /* ... */ }
|
||||
/// if true { /* ... */ }
|
||||
///
|
||||
/// // Good
|
||||
/// let res = { let x = somefunc(); x };
|
||||
/// if res { /* ... */ }
|
||||
/// ```
|
||||
|
|
|
@ -13,23 +13,21 @@ declare_clippy_lint! {
|
|||
///
|
||||
/// ### Example
|
||||
/// ```rust
|
||||
/// // Bad
|
||||
/// fn simple_double_parens() -> i32 {
|
||||
/// ((0))
|
||||
/// }
|
||||
///
|
||||
/// // Good
|
||||
/// # fn foo(bar: usize) {}
|
||||
/// foo((0));
|
||||
/// ```
|
||||
///
|
||||
/// Use instead:
|
||||
/// ```rust
|
||||
/// fn simple_no_parens() -> i32 {
|
||||
/// 0
|
||||
/// }
|
||||
///
|
||||
/// // or
|
||||
///
|
||||
/// # fn foo(bar: usize) {}
|
||||
/// // Bad
|
||||
/// foo((0));
|
||||
///
|
||||
/// // Good
|
||||
/// foo(0);
|
||||
/// ```
|
||||
#[clippy::version = "pre 1.29.0"]
|
||||
|
|
|
@ -30,9 +30,9 @@ declare_clippy_lint! {
|
|||
/// ```rust
|
||||
/// # let x = 1;
|
||||
/// if x + 1 == x + 1 {}
|
||||
/// ```
|
||||
/// or
|
||||
/// ```rust
|
||||
///
|
||||
/// // or
|
||||
///
|
||||
/// # let a = 3;
|
||||
/// # let b = 4;
|
||||
/// assert_eq!(a, a);
|
||||
|
|
|
@ -180,29 +180,24 @@ declare_clippy_lint! {
|
|||
/// ### Example
|
||||
/// ```rust
|
||||
/// # let opt = Some(1);
|
||||
///
|
||||
/// // Bad
|
||||
/// # let res: Result<i32, std::io::Error> = Ok(1);
|
||||
/// for x in opt {
|
||||
/// // ..
|
||||
/// }
|
||||
///
|
||||
/// // Good
|
||||
/// if let Some(x) = opt {
|
||||
/// for x in &res {
|
||||
/// // ..
|
||||
/// }
|
||||
/// ```
|
||||
///
|
||||
/// or
|
||||
///
|
||||
/// Use instead:
|
||||
/// ```rust
|
||||
/// # let opt = Some(1);
|
||||
/// # let res: Result<i32, std::io::Error> = Ok(1);
|
||||
///
|
||||
/// // Bad
|
||||
/// for x in &res {
|
||||
/// if let Some(x) = opt {
|
||||
/// // ..
|
||||
/// }
|
||||
///
|
||||
/// // Good
|
||||
/// if let Ok(x) = res {
|
||||
/// // ..
|
||||
/// }
|
||||
|
|
|
@ -194,25 +194,18 @@ declare_clippy_lint! {
|
|||
///
|
||||
/// ### Examples
|
||||
/// ```rust
|
||||
/// # let opt = Some(1);
|
||||
///
|
||||
/// // Bad
|
||||
/// opt.unwrap();
|
||||
///
|
||||
/// // Good
|
||||
/// opt.expect("more helpful message");
|
||||
/// # let option = Some(1);
|
||||
/// # let result: Result<usize, ()> = Ok(1);
|
||||
/// option.unwrap();
|
||||
/// result.unwrap();
|
||||
/// ```
|
||||
///
|
||||
/// or
|
||||
///
|
||||
/// Use instead:
|
||||
/// ```rust
|
||||
/// # let res: Result<usize, ()> = Ok(1);
|
||||
///
|
||||
/// // Bad
|
||||
/// res.unwrap();
|
||||
///
|
||||
/// // Good
|
||||
/// res.expect("more helpful message");
|
||||
/// # let option = Some(1);
|
||||
/// # let result: Result<usize, ()> = Ok(1);
|
||||
/// option.expect("more helpful message");
|
||||
/// result.expect("more helpful message");
|
||||
/// ```
|
||||
#[clippy::version = "1.45.0"]
|
||||
pub UNWRAP_USED,
|
||||
|
@ -235,27 +228,21 @@ declare_clippy_lint! {
|
|||
///
|
||||
/// ### Examples
|
||||
/// ```rust,ignore
|
||||
/// # let opt = Some(1);
|
||||
///
|
||||
/// // Bad
|
||||
/// opt.expect("one");
|
||||
///
|
||||
/// // Good
|
||||
/// let opt = Some(1);
|
||||
/// opt?;
|
||||
/// # let option = Some(1);
|
||||
/// # let result: Result<usize, ()> = Ok(1);
|
||||
/// option.expect("one");
|
||||
/// result.expect("one");
|
||||
/// ```
|
||||
///
|
||||
/// or
|
||||
/// Use instead:
|
||||
/// ```rust,ignore
|
||||
/// # let option = Some(1);
|
||||
/// # let result: Result<usize, ()> = Ok(1);
|
||||
/// option?;
|
||||
///
|
||||
/// ```rust
|
||||
/// # let res: Result<usize, ()> = Ok(1);
|
||||
/// // or
|
||||
///
|
||||
/// // Bad
|
||||
/// res.expect("one");
|
||||
///
|
||||
/// // Good
|
||||
/// res?;
|
||||
/// # Ok::<(), ()>(())
|
||||
/// result?;
|
||||
/// ```
|
||||
#[clippy::version = "1.45.0"]
|
||||
pub EXPECT_USED,
|
||||
|
@ -431,26 +418,20 @@ declare_clippy_lint! {
|
|||
///
|
||||
/// ### Examples
|
||||
/// ```rust
|
||||
/// # let x = Some(1);
|
||||
///
|
||||
/// // Bad
|
||||
/// x.map(|a| a + 1).unwrap_or(0);
|
||||
///
|
||||
/// // Good
|
||||
/// x.map_or(0, |a| a + 1);
|
||||
/// # let option = Some(1);
|
||||
/// # let result: Result<usize, ()> = Ok(1);
|
||||
/// # fn some_function(foo: ()) -> usize { 1 }
|
||||
/// option.map(|a| a + 1).unwrap_or(0);
|
||||
/// result.map(|a| a + 1).unwrap_or_else(some_function);
|
||||
/// ```
|
||||
///
|
||||
/// or
|
||||
///
|
||||
/// Use instead:
|
||||
/// ```rust
|
||||
/// # let x: Result<usize, ()> = Ok(1);
|
||||
/// # let option = Some(1);
|
||||
/// # let result: Result<usize, ()> = Ok(1);
|
||||
/// # fn some_function(foo: ()) -> usize { 1 }
|
||||
///
|
||||
/// // Bad
|
||||
/// x.map(|a| a + 1).unwrap_or_else(some_function);
|
||||
///
|
||||
/// // Good
|
||||
/// x.map_or_else(some_function, |a| a + 1);
|
||||
/// option.map_or(0, |a| a + 1);
|
||||
/// result.map_or_else(some_function, |a| a + 1);
|
||||
/// ```
|
||||
#[clippy::version = "1.45.0"]
|
||||
pub MAP_UNWRAP_OR,
|
||||
|
@ -793,13 +774,14 @@ declare_clippy_lint! {
|
|||
/// # let foo = Some(String::new());
|
||||
/// foo.unwrap_or(String::new());
|
||||
/// ```
|
||||
/// this can instead be written:
|
||||
///
|
||||
/// Use instead:
|
||||
/// ```rust
|
||||
/// # let foo = Some(String::new());
|
||||
/// foo.unwrap_or_else(String::new);
|
||||
/// ```
|
||||
/// or
|
||||
/// ```rust
|
||||
///
|
||||
/// // or
|
||||
///
|
||||
/// # let foo = Some(String::new());
|
||||
/// foo.unwrap_or_default();
|
||||
/// ```
|
||||
|
@ -863,15 +845,14 @@ declare_clippy_lint! {
|
|||
/// # let err_code = "418";
|
||||
/// # let err_msg = "I'm a teapot";
|
||||
/// foo.expect(&format!("Err {}: {}", err_code, err_msg));
|
||||
/// ```
|
||||
/// or
|
||||
/// ```rust
|
||||
///
|
||||
/// // or
|
||||
///
|
||||
/// # let foo = Some(String::new());
|
||||
/// # let err_code = "418";
|
||||
/// # let err_msg = "I'm a teapot";
|
||||
/// foo.expect(format!("Err {}: {}", err_code, err_msg).as_str());
|
||||
/// ```
|
||||
/// this can instead be written:
|
||||
///
|
||||
/// Use instead:
|
||||
/// ```rust
|
||||
/// # let foo = Some(String::new());
|
||||
/// # let err_code = "418";
|
||||
|
|
|
@ -18,11 +18,11 @@ declare_clippy_lint! {
|
|||
/// the least it hurts readability of the code.
|
||||
///
|
||||
/// ### Example
|
||||
/// ```ignore
|
||||
/// ```rust,ignore
|
||||
/// min(0, max(100, x))
|
||||
/// ```
|
||||
/// or
|
||||
/// ```ignore
|
||||
///
|
||||
/// // or
|
||||
///
|
||||
/// x.max(100).min(0)
|
||||
/// ```
|
||||
/// It will always be equal to `0`. Probably the author meant to clamp the value
|
||||
|
|
|
@ -103,11 +103,14 @@ declare_clippy_lint! {
|
|||
/// let x = 1.2331f64;
|
||||
/// let y = 1.2332f64;
|
||||
///
|
||||
/// // Bad
|
||||
/// if y == 1.23f64 { }
|
||||
/// if y != x {} // where both are floats
|
||||
/// ```
|
||||
///
|
||||
/// // Good
|
||||
/// Use instead:
|
||||
/// ```rust
|
||||
/// # let x = 1.2331f64;
|
||||
/// # let y = 1.2332f64;
|
||||
/// let error_margin = f64::EPSILON; // Use an epsilon for comparison
|
||||
/// // Or, if Rust <= 1.42, use `std::f64::EPSILON` constant instead.
|
||||
/// // let error_margin = std::f64::EPSILON;
|
||||
|
@ -258,10 +261,13 @@ declare_clippy_lint! {
|
|||
/// let x: f64 = 1.0;
|
||||
/// const ONE: f64 = 1.00;
|
||||
///
|
||||
/// // Bad
|
||||
/// if x == ONE { } // where both are floats
|
||||
/// ```
|
||||
///
|
||||
/// // Good
|
||||
/// Use instead:
|
||||
/// ```rust
|
||||
/// # let x: f64 = 1.0;
|
||||
/// # const ONE: f64 = 1.00;
|
||||
/// let error_margin = f64::EPSILON; // Use an epsilon for comparison
|
||||
/// // Or, if Rust <= 1.42, use `std::f64::EPSILON` constant instead.
|
||||
/// // let error_margin = std::f64::EPSILON;
|
||||
|
|
|
@ -22,9 +22,12 @@ declare_clippy_lint! {
|
|||
/// ### Example
|
||||
/// ```rust,ignore
|
||||
/// debug_assert_eq!(vec![3].pop(), Some(3));
|
||||
///
|
||||
/// // or
|
||||
/// fn take_a_mut_parameter(_: &mut u32) -> bool { unimplemented!() }
|
||||
/// debug_assert!(take_a_mut_parameter(&mut 5));
|
||||
///
|
||||
/// # let mut x = 5;
|
||||
/// # fn takes_a_mut_parameter(_: &mut u32) -> bool { unimplemented!() }
|
||||
/// debug_assert!(takes_a_mut_parameter(&mut x));
|
||||
/// ```
|
||||
#[clippy::version = "1.40.0"]
|
||||
pub DEBUG_ASSERT_WITH_MUT_CALL,
|
||||
|
|
|
@ -54,14 +54,14 @@ declare_clippy_lint! {
|
|||
/// fn func<T: Clone + Default>(arg: T) where T: Clone + Default {}
|
||||
/// ```
|
||||
///
|
||||
/// Could be written as:
|
||||
///
|
||||
/// Use instead:
|
||||
/// ```rust
|
||||
/// # mod hidden {
|
||||
/// fn func<T: Clone + Default>(arg: T) {}
|
||||
/// ```
|
||||
/// or
|
||||
/// # }
|
||||
///
|
||||
/// // or
|
||||
///
|
||||
/// ```rust
|
||||
/// fn func<T>(arg: T) where T: Clone + Default {}
|
||||
/// ```
|
||||
#[clippy::version = "1.47.0"]
|
||||
|
|
Loading…
Reference in a new issue