Skip to content

Commit b28aeeb

Browse files
committed
Fix indentation
1 parent c872f47 commit b28aeeb

File tree

2 files changed

+35
-35
lines changed

2 files changed

+35
-35
lines changed

src/librustc_mir/transform/elaborate_drops.rs

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -102,37 +102,37 @@ fn find_dead_unwinds<'a, 'tcx>(
102102
_ => continue,
103103
};
104104

105-
let mut init_data = InitializationData {
106-
live: flow_inits.sets().on_entry_set_for(bb.index()).to_owned(),
107-
dead: IdxSetBuf::new_empty(env.move_data.move_paths.len()),
108-
};
109-
debug!("find_dead_unwinds @ {:?}: {:?}; init_data={:?}",
110-
bb, bb_data, init_data.live);
111-
for stmt in 0..bb_data.statements.len() {
112-
let loc = Location { block: bb, statement_index: stmt };
113-
init_data.apply_location(tcx, mir, env, loc);
114-
}
105+
let mut init_data = InitializationData {
106+
live: flow_inits.sets().on_entry_set_for(bb.index()).to_owned(),
107+
dead: IdxSetBuf::new_empty(env.move_data.move_paths.len()),
108+
};
109+
debug!("find_dead_unwinds @ {:?}: {:?}; init_data={:?}",
110+
bb, bb_data, init_data.live);
111+
for stmt in 0..bb_data.statements.len() {
112+
let loc = Location { block: bb, statement_index: stmt };
113+
init_data.apply_location(tcx, mir, env, loc);
114+
}
115115

116-
let path = match env.move_data.rev_lookup.find(location) {
117-
LookupResult::Exact(e) => e,
118-
LookupResult::Parent(..) => {
119-
debug!("find_dead_unwinds: has parent; skipping");
120-
continue
121-
}
122-
};
116+
let path = match env.move_data.rev_lookup.find(location) {
117+
LookupResult::Exact(e) => e,
118+
LookupResult::Parent(..) => {
119+
debug!("find_dead_unwinds: has parent; skipping");
120+
continue
121+
}
122+
};
123123

124-
debug!("find_dead_unwinds @ {:?}: path({:?})={:?}", bb, location, path);
124+
debug!("find_dead_unwinds @ {:?}: path({:?})={:?}", bb, location, path);
125125

126-
let mut maybe_live = false;
127-
on_all_drop_children_bits(tcx, mir, &env, path, |child| {
128-
let (child_maybe_live, _) = init_data.state(child);
129-
maybe_live |= child_maybe_live;
130-
});
126+
let mut maybe_live = false;
127+
on_all_drop_children_bits(tcx, mir, &env, path, |child| {
128+
let (child_maybe_live, _) = init_data.state(child);
129+
maybe_live |= child_maybe_live;
130+
});
131131

132-
debug!("find_dead_unwinds @ {:?}: maybe_live={}", bb, maybe_live);
133-
if !maybe_live {
134-
dead_unwinds.add(&bb);
135-
}
132+
debug!("find_dead_unwinds @ {:?}: maybe_live={}", bb, maybe_live);
133+
if !maybe_live {
134+
dead_unwinds.add(&bb);
135+
}
136136
}
137137

138138
dead_unwinds

src/librustc_typeck/check/mod.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3331,15 +3331,15 @@ impl<'a, 'gcx, 'tcx> FnCtxt<'a, 'gcx, 'tcx> {
33313331
.join(", ");
33323332

33333333
struct_span_err!(tcx.sess, span, E0063,
3334-
"missing field{} {}{} in initializer of `{}`",
3334+
"missing field{} {}{} in initializer of `{}`",
33353335
if remaining_fields.len() == 1 { "" } else { "s" },
3336-
remaining_fields_names,
3337-
truncated_fields_error,
3338-
adt_ty)
3339-
.span_label(span, format!("missing {}{}",
3340-
remaining_fields_names,
3341-
truncated_fields_error))
3342-
.emit();
3336+
remaining_fields_names,
3337+
truncated_fields_error,
3338+
adt_ty)
3339+
.span_label(span, format!("missing {}{}",
3340+
remaining_fields_names,
3341+
truncated_fields_error))
3342+
.emit();
33433343
}
33443344
}
33453345

0 commit comments

Comments
 (0)