bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

dogfood with expanded uninlined_format_args

Browse source
This commit is contained in:
kraktus 2022-11-25 16:41:08 +01:00
parent 5610d22c8d
commit 2fd10bc59b
2 changed files with 12 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

15
clippy_utils/src/ty.rs
View file

@ -1005,14 +1005,12 @@ pub fn make_projection<'tcx>(
debug_assert!( debug_assert!(
generic_count == substs.len(), generic_count == substs.len(),
"wrong number of substs for `{:?}`: found `{}` expected `{}`.\n\ "wrong number of substs for `{:?}`: found `{}` expected `{generic_count}`.\n\
note: the expected parameters are: {:#?}\n\ note: the expected parameters are: {:#?}\n\
the given arguments are: `{:#?}`", the given arguments are: `{substs:#?}`",
assoc_item.def_id, assoc_item.def_id,
substs.len(), substs.len(),
generic_count,
params.map(GenericParamDefKind::descr).collect::<Vec<_>>(), params.map(GenericParamDefKind::descr).collect::<Vec<_>>(),
substs,
); );
if let Some((idx, (param, arg))) = params if let Some((idx, (param, arg))) = params
@ -1030,14 +1028,11 @@ pub fn make_projection<'tcx>(
{ {
debug_assert!( debug_assert!(
false, false,
"mismatched subst type at index {}: expected a {}, found `{:?}`\n\ "mismatched subst type at index {idx}: expected a {}, found `{arg:?}`\n\
note: the expected parameters are {:#?}\n\ note: the expected parameters are {:#?}\n\
the given arguments are {:#?}", the given arguments are {substs:#?}",
idx,
param.descr(), param.descr(),
arg, params.map(GenericParamDefKind::descr).collect::<Vec<_>>()
params.map(GenericParamDefKind::descr).collect::<Vec<_>>(),
substs,
); );
} }
} }

15
lintcheck/src/main.rs
View file

@ -120,8 +120,8 @@ impl ClippyWarning {
format!("$CARGO_HOME/{}", stripped.display()) format!("$CARGO_HOME/{}", stripped.display())
} else { } else {
format!( format!(
"target/lintcheck/sources/{}-{}/{}", "target/lintcheck/sources/{crate_name}-{crate_version}/{}",
crate_name, crate_version, span.file_name span.file_name
) )
}; };
@ -322,13 +322,13 @@ impl Crate {
if config.max_jobs == 1 { if config.max_jobs == 1 {
println!( println!(
"{}/{} {}% Linting {} {}", "{index}/{total_crates_to_lint} {perc}% Linting {} {}",
index, total_crates_to_lint, perc, &self.name, &self.version &self.name, &self.version
); );
} else { } else {
println!( println!(
"{}/{} {}% Linting {} {} in target dir {:?}", "{index}/{total_crates_to_lint} {perc}% Linting {} {} in target dir {thread_index:?}",
index, total_crates_to_lint, perc, &self.name, &self.version, thread_index &self.name, &self.version
); );
} }
@ -398,8 +398,7 @@ impl Crate {
.output() .output()
.unwrap_or_else(|error| { .unwrap_or_else(|error| {
panic!( panic!(
"Encountered error:\n{:?}\ncargo_clippy_path: {}\ncrate path:{}\n", "Encountered error:\n{error:?}\ncargo_clippy_path: {}\ncrate path:{}\n",
error,
&cargo_clippy_path.display(), &cargo_clippy_path.display(),
&self.path.display() &self.path.display()
); );