Skip to content

Commit 89ce6b6

Browse files
committed
Address review comments
1 parent 1644376 commit 89ce6b6

File tree

3 files changed

+17
-3381
lines changed

3 files changed

+17
-3381
lines changed

crates/project_model/src/lib.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ impl fmt::Debug for ProjectWorkspace {
4646
.field("n_sysroot_crates", &sysroot.crates().len())
4747
.field(
4848
"n_rustc_compiler_crates",
49-
&rustc.as_ref().map(|rc| rc.packages().len()).unwrap_or(0),
49+
&rustc.as_ref().map_or(0, |rc| rc.packages().len()),
5050
)
5151
.finish(),
5252
ProjectWorkspace::Json { project, sysroot } => {
@@ -314,8 +314,7 @@ impl ProjectWorkspace {
314314
match self {
315315
ProjectWorkspace::Json { project, .. } => project.n_crates(),
316316
ProjectWorkspace::Cargo { cargo, sysroot, rustc } => {
317-
let rustc_package_len = rustc.as_ref().map(|rc| rc.packages().len()).unwrap_or(0);
318-
dbg!(rustc_package_len);
317+
let rustc_package_len = rustc.as_ref().map_or(0, |rc| rc.packages().len());
319318
cargo.packages().len() + sysroot.crates().len() + rustc_package_len
320319
}
321320
}

0 commit comments

Comments
 (0)