fix couple of clippy findings:
filter_map_identity iter_kv_map needless_question_mark redundant_at_rest_pattern filter_next derivable_impls
This commit is contained in:
parent
cec34a43b1
commit
adf759bf6a
6 changed files with 8 additions and 16 deletions
|
@ -401,7 +401,7 @@ fn parse_clobber_abi<'a>(p: &mut Parser<'a>, args: &mut AsmArgs) -> PResult<'a,
|
||||||
// should have errored above during parsing
|
// should have errored above during parsing
|
||||||
[] => unreachable!(),
|
[] => unreachable!(),
|
||||||
[(abi, _span)] => args.clobber_abis.push((*abi, full_span)),
|
[(abi, _span)] => args.clobber_abis.push((*abi, full_span)),
|
||||||
[abis @ ..] => {
|
abis => {
|
||||||
for (abi, span) in abis {
|
for (abi, span) in abis {
|
||||||
args.clobber_abis.push((*abi, *span));
|
args.clobber_abis.push((*abi, *span));
|
||||||
}
|
}
|
||||||
|
|
|
@ -49,7 +49,7 @@ impl<'a> Parser<'a> {
|
||||||
&& self.check_ident()
|
&& self.check_ident()
|
||||||
// `Const` followed by IDENT
|
// `Const` followed by IDENT
|
||||||
{
|
{
|
||||||
return Ok(self.recover_const_param_with_mistyped_const(preceding_attrs, ident)?);
|
return self.recover_const_param_with_mistyped_const(preceding_attrs, ident);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Parse optional colon and param bounds.
|
// Parse optional colon and param bounds.
|
||||||
|
|
|
@ -183,7 +183,7 @@ pub(super) fn encode_all_query_results<'tcx>(
|
||||||
encoder: &mut CacheEncoder<'_, 'tcx>,
|
encoder: &mut CacheEncoder<'_, 'tcx>,
|
||||||
query_result_index: &mut EncodedDepNodeIndex,
|
query_result_index: &mut EncodedDepNodeIndex,
|
||||||
) {
|
) {
|
||||||
for encode in super::ENCODE_QUERY_RESULTS.iter().copied().filter_map(|e| e) {
|
for encode in super::ENCODE_QUERY_RESULTS.iter().copied().flatten() {
|
||||||
encode(tcx, encoder, query_result_index);
|
encode(tcx, encoder, query_result_index);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -227,10 +227,8 @@ impl CodeStats {
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn print_vtable_sizes(&self, crate_name: &str) {
|
pub fn print_vtable_sizes(&self, crate_name: &str) {
|
||||||
let mut infos = std::mem::take(&mut *self.vtable_sizes.lock())
|
let mut infos =
|
||||||
.into_iter()
|
std::mem::take(&mut *self.vtable_sizes.lock()).into_values().collect::<Vec<_>>();
|
||||||
.map(|(_did, stats)| stats)
|
|
||||||
.collect::<Vec<_>>();
|
|
||||||
|
|
||||||
// Primary sort: cost % in reverse order (from largest to smallest)
|
// Primary sort: cost % in reverse order (from largest to smallest)
|
||||||
// Secondary sort: trait_name
|
// Secondary sort: trait_name
|
||||||
|
|
|
@ -329,18 +329,13 @@ pub struct OnUnimplementedNote {
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Append a message for `~const Trait` errors.
|
/// Append a message for `~const Trait` errors.
|
||||||
#[derive(Clone, Copy, PartialEq, Eq, Debug)]
|
#[derive(Clone, Copy, PartialEq, Eq, Debug, Default)]
|
||||||
pub enum AppendConstMessage {
|
pub enum AppendConstMessage {
|
||||||
|
#[default]
|
||||||
Default,
|
Default,
|
||||||
Custom(Symbol),
|
Custom(Symbol),
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Default for AppendConstMessage {
|
|
||||||
fn default() -> Self {
|
|
||||||
AppendConstMessage::Default
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl<'tcx> OnUnimplementedDirective {
|
impl<'tcx> OnUnimplementedDirective {
|
||||||
fn parse(
|
fn parse(
|
||||||
tcx: TyCtxt<'tcx>,
|
tcx: TyCtxt<'tcx>,
|
||||||
|
|
|
@ -183,8 +183,7 @@ pub fn test_main_static_abort(tests: &[&TestDescAndFn]) {
|
||||||
|
|
||||||
let test = tests
|
let test = tests
|
||||||
.into_iter()
|
.into_iter()
|
||||||
.filter(|test| test.desc.name.as_slice() == name)
|
.find(|test| test.desc.name.as_slice() == name)
|
||||||
.next()
|
|
||||||
.unwrap_or_else(|| panic!("couldn't find a test with the provided name '{name}'"));
|
.unwrap_or_else(|| panic!("couldn't find a test with the provided name '{name}'"));
|
||||||
let TestDescAndFn { desc, testfn } = test;
|
let TestDescAndFn { desc, testfn } = test;
|
||||||
match testfn.into_runnable() {
|
match testfn.into_runnable() {
|
||||||
|
|
Loading…
Add table
Reference in a new issue