97dc4b22c6
When encountering code such as: ``` Box::new(outer::Inner::default()) ``` clippy would suggest replacing with `Box::<Inner>::default()`, dropping the `outer::` segment. This behavior is incorrect and that commit fixes it. What it does is it checks the contents of the `Box::new` and, if it is of the form `A::B::default`, does a text replacement, inserting `A::B` in the `Box`'s quickfix generic list. If the source does not match that pattern (including `Vec::from(..)` or other `T::new()` calls), we then fallback to the original code. Fixes #11927
123 lines
2.9 KiB
Rust
123 lines
2.9 KiB
Rust
#![warn(clippy::box_default)]
|
|
#![allow(clippy::default_constructed_unit_structs)]
|
|
|
|
#[derive(Default)]
|
|
struct ImplementsDefault;
|
|
|
|
struct OwnDefault;
|
|
|
|
impl OwnDefault {
|
|
fn default() -> Self {
|
|
Self
|
|
}
|
|
}
|
|
|
|
macro_rules! outer {
|
|
($e: expr) => {
|
|
$e
|
|
};
|
|
}
|
|
|
|
fn main() {
|
|
let _string: Box<String> = Box::default();
|
|
let _byte = Box::<u8>::default();
|
|
let _vec = Box::<Vec::<u8>>::default();
|
|
let _impl = Box::<ImplementsDefault>::default();
|
|
let _impl2 = Box::<ImplementsDefault>::default();
|
|
let _impl3: Box<ImplementsDefault> = Box::default();
|
|
let _own = Box::new(OwnDefault::default()); // should not lint
|
|
let _in_macro = outer!(Box::<String>::default());
|
|
let _string_default = outer!(Box::<String>::default());
|
|
let _vec2: Box<Vec<ImplementsDefault>> = Box::default();
|
|
let _vec3: Box<Vec<bool>> = Box::default();
|
|
let _vec4: Box<_> = Box::<Vec<bool>>::default();
|
|
let _more = ret_ty_fn();
|
|
call_ty_fn(Box::default());
|
|
issue_10381();
|
|
|
|
// `Box::<Option<_>>::default()` would be valid here, but not `Box::default()` or
|
|
// `Box::<Option<{closure@...}>::default()`
|
|
//
|
|
// Would have a suggestion after https://github.com/rust-lang/rust/blob/fdd030127cc68afec44a8d3f6341525dd34e50ae/compiler/rustc_middle/src/ty/diagnostics.rs#L554-L563
|
|
let mut unnameable = Box::new(Option::default());
|
|
let _ = unnameable.insert(|| {});
|
|
}
|
|
|
|
fn ret_ty_fn() -> Box<bool> {
|
|
Box::<bool>::default()
|
|
}
|
|
|
|
#[allow(clippy::boxed_local)]
|
|
fn call_ty_fn(_b: Box<u8>) {
|
|
issue_9621_dyn_trait();
|
|
}
|
|
|
|
use std::io::{Read, Result};
|
|
|
|
impl Read for ImplementsDefault {
|
|
fn read(&mut self, _: &mut [u8]) -> Result<usize> {
|
|
Ok(0)
|
|
}
|
|
}
|
|
|
|
fn issue_9621_dyn_trait() {
|
|
let _: Box<dyn Read> = Box::<ImplementsDefault>::default();
|
|
issue_10089();
|
|
}
|
|
|
|
fn issue_10089() {
|
|
let _closure = || {
|
|
#[derive(Default)]
|
|
struct WeirdPathed;
|
|
|
|
let _ = Box::<WeirdPathed>::default();
|
|
};
|
|
}
|
|
|
|
fn issue_10381() {
|
|
#[derive(Default)]
|
|
pub struct Foo {}
|
|
pub trait Bar {}
|
|
impl Bar for Foo {}
|
|
|
|
fn maybe_get_bar(i: u32) -> Option<Box<dyn Bar>> {
|
|
if i % 2 == 0 {
|
|
Some(Box::<Foo>::default())
|
|
} else {
|
|
None
|
|
}
|
|
}
|
|
|
|
assert!(maybe_get_bar(2).is_some());
|
|
}
|
|
|
|
#[allow(unused)]
|
|
fn issue_11868() {
|
|
fn foo(_: &mut Vec<usize>) {}
|
|
|
|
macro_rules! bar {
|
|
($baz:expr) => {
|
|
Box::leak(Box::new($baz))
|
|
};
|
|
}
|
|
|
|
foo(bar!(vec![]));
|
|
foo(bar!(vec![1]));
|
|
}
|
|
|
|
// Issue #11927: The quickfix for the `Box::new` suggests replacing with `Box::<Inner>::default()`,
|
|
// removing the `outer::` segment.
|
|
fn issue_11927() {
|
|
mod outer {
|
|
#[derive(Default)]
|
|
pub struct Inner {
|
|
_i: usize,
|
|
}
|
|
}
|
|
|
|
fn foo() {
|
|
let _b = Box::<outer::Inner>::default();
|
|
let _b = Box::<std::collections::HashSet::<i32>>::default();
|
|
}
|
|
}
|