Skip to content

Commit 541c45b

Browse files
committed
Miscellaneous fixes and cleanup
1 parent 729b07f commit 541c45b

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

src/librustc/back/passes.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -165,10 +165,10 @@ pub fn create_standard_passes(level: OptLevel) -> ~[~str] {
165165
}
166166

167167
pub fn populate_pass_manager(sess: Session, pm: &mut PassManager, pass_list:&[~str]) {
168-
for pass_list.iter().advance |&nm| {
169-
match create_pass(nm) {
168+
for pass_list.iter().advance |nm| {
169+
match create_pass(*nm) {
170170
Some(p) => pm.add_pass(p),
171-
None => sess.warn(fmt!("Unknown pass %s", nm))
171+
None => sess.warn(fmt!("Unknown pass %s", *nm))
172172
}
173173
}
174174
}

src/librustc/driver/driver.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,6 @@ pub fn compile_rest(sess: Session,
314314
method_map: method_map,
315315
vtable_map: vtable_map,
316316
write_guard_map: write_guard_map,
317-
moves_map: moves_map,
318317
capture_map: capture_map
319318
};
320319

src/librustc/metadata/loader.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,9 @@ fn find_library_crate_aux(
127127
cx.diag.span_err(
128128
cx.span, fmt!("multiple matching crates for `%s`", crate_name));
129129
cx.diag.handler().note("candidates:");
130-
for matches.iter().advance |&(ident, data)| {
130+
for matches.iter().advance |pair| {
131+
let ident = pair.first();
132+
let data = pair.second();
131133
cx.diag.handler().note(fmt!("path: %s", ident));
132134
let attrs = decoder::get_crate_attributes(data);
133135
note_linkage_attrs(cx.intr, cx.diag, attrs);

0 commit comments

Comments
 (0)