Skip to content

Commit f352e98

Browse files
committed
Address review comments
1 parent f1e3a5a commit f352e98

File tree

2 files changed

+6
-12
lines changed

2 files changed

+6
-12
lines changed

src/bootstrap/lib.rs

+1
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@
115115
116116
#![deny(warnings)]
117117
#![feature(core_intrinsics)]
118+
#![feature(drain_filter)]
118119

119120
#[macro_use]
120121
extern crate build_helper;

src/bootstrap/tool.rs

+5-12
Original file line numberDiff line numberDiff line change
@@ -186,27 +186,20 @@ impl Step for ToolBuild {
186186
than in a previous build:\n");
187187
println!("the following dependencies are duplicated although they \
188188
have the same features enabled:");
189-
for (id, cur, prev) in &duplicates {
189+
for (id, cur, prev) in duplicates.drain_filter(|(_, cur, prev)| cur.2 == prev.2) {
190190
println!(" {}", id);
191-
if cur.2 == prev.2 {
192-
// same features
193-
println!(" `{}` ({:?})\n `{}` ({:?})", cur.0, cur.1, prev.0, prev.1);
194-
}
191+
// same features
192+
println!(" `{}` ({:?})\n `{}` ({:?})", cur.0, cur.1, prev.0, prev.1);
195193
}
196194
println!("the following dependencies have different features:");
197195
for (id, cur, prev) in duplicates {
198196
println!(" {}", id);
199-
if cur.2 == prev.2 {
200-
continue;
201-
}
202197
let cur_features: HashSet<_> = cur.2.into_iter().collect();
203198
let prev_features: HashSet<_> = prev.2.into_iter().collect();
204-
let cur_extra: Vec<_> = cur_features.difference(&prev_features).collect();
205-
let prev_extra: Vec<_> = prev_features.difference(&cur_features).collect();
206199
println!(" `{}` additionally enabled features {:?} at {:?}",
207-
cur.0, cur_extra, cur.1);
200+
cur.0, &cur_features - &prev_features, cur.1);
208201
println!(" `{}` additionally enabled features {:?} at {:?}",
209-
prev.0, prev_extra, prev.1);
202+
prev.0, &prev_features - &cur_features, prev.1);
210203
}
211204
println!("");
212205
panic!("tools should not compile multiple copies of the same crate");

0 commit comments

Comments
 (0)