mirror of
https://github.com/rust-lang/rust-clippy
synced 2024-11-24 21:53:23 +00:00
eb3970285b
In order to switch `clippy::uninlined_format_args` from pedantic to style, all existing tests must not raise a warning. I did not want to change the actual tests, so this is a relatively minor change that: * add `#![allow(clippy::uninlined_format_args)]` where needed * normalizes all allow/deny/warn attributes * all allow attributes are grouped together * sorted alphabetically * the `clippy::*` attributes are listed separate from the other ones. * deny and warn attributes are listed before the allowed ones changelog: none
81 lines
2 KiB
Rust
81 lines
2 KiB
Rust
// aux-build:option_helpers.rs
|
|
#![warn(clippy::map_unwrap_or)]
|
|
#![allow(clippy::uninlined_format_args)]
|
|
|
|
#[macro_use]
|
|
extern crate option_helpers;
|
|
|
|
use std::collections::HashMap;
|
|
|
|
#[rustfmt::skip]
|
|
fn option_methods() {
|
|
let opt = Some(1);
|
|
|
|
// Check for `option.map(_).unwrap_or(_)` use.
|
|
// Single line case.
|
|
let _ = opt.map(|x| x + 1)
|
|
// Should lint even though this call is on a separate line.
|
|
.unwrap_or(0);
|
|
// Multi-line cases.
|
|
let _ = opt.map(|x| {
|
|
x + 1
|
|
}
|
|
).unwrap_or(0);
|
|
let _ = opt.map(|x| x + 1)
|
|
.unwrap_or({
|
|
0
|
|
});
|
|
// Single line `map(f).unwrap_or(None)` case.
|
|
let _ = opt.map(|x| Some(x + 1)).unwrap_or(None);
|
|
// Multi-line `map(f).unwrap_or(None)` cases.
|
|
let _ = opt.map(|x| {
|
|
Some(x + 1)
|
|
}
|
|
).unwrap_or(None);
|
|
let _ = opt
|
|
.map(|x| Some(x + 1))
|
|
.unwrap_or(None);
|
|
// macro case
|
|
let _ = opt_map!(opt, |x| x + 1).unwrap_or(0); // should not lint
|
|
|
|
// Should not lint if not copyable
|
|
let id: String = "identifier".to_string();
|
|
let _ = Some("prefix").map(|p| format!("{}.{}", p, id)).unwrap_or(id);
|
|
// ...but DO lint if the `unwrap_or` argument is not used in the `map`
|
|
let id: String = "identifier".to_string();
|
|
let _ = Some("prefix").map(|p| format!("{}.", p)).unwrap_or(id);
|
|
|
|
// Check for `option.map(_).unwrap_or_else(_)` use.
|
|
// Multi-line cases.
|
|
let _ = opt.map(|x| {
|
|
x + 1
|
|
}
|
|
).unwrap_or_else(|| 0);
|
|
let _ = opt.map(|x| x + 1)
|
|
.unwrap_or_else(||
|
|
0
|
|
);
|
|
}
|
|
|
|
#[rustfmt::skip]
|
|
fn result_methods() {
|
|
let res: Result<i32, ()> = Ok(1);
|
|
|
|
// Check for `result.map(_).unwrap_or_else(_)` use.
|
|
// multi line cases
|
|
let _ = res.map(|x| {
|
|
x + 1
|
|
}
|
|
).unwrap_or_else(|_e| 0);
|
|
let _ = res.map(|x| x + 1)
|
|
.unwrap_or_else(|_e| {
|
|
0
|
|
});
|
|
// macro case
|
|
let _ = opt_map!(res, |x| x + 1).unwrap_or_else(|_e| 0); // should not lint
|
|
}
|
|
|
|
fn main() {
|
|
option_methods();
|
|
result_methods();
|
|
}
|