Skip to content

Commit 44d4048

Browse files
committed
Auto merge of #28724 - tsion:remove-double-semicolons, r=alexcrichton
Really minor code cleanup, because why not?
2 parents 15db6ec + 55e4842 commit 44d4048

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

src/libcollectionstest/string.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ fn test_str_add() {
264264

265265
#[test]
266266
fn remove() {
267-
let mut s = "ศไทย中华Việt Nam; foobar".to_string();;
267+
let mut s = "ศไทย中华Việt Nam; foobar".to_string();
268268
assert_eq!(s.remove(0), 'ศ');
269269
assert_eq!(s.len(), 33);
270270
assert_eq!(s, "ไทย中华Việt Nam; foobar");

src/librustc/metadata/loader.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -726,7 +726,7 @@ fn get_metadata_section(target: &Target, filename: &Path)
726726
ret = Some(get_metadata_section_imp(target, filename));
727727
});
728728
info!("reading {:?} => {:?}", filename.file_name().unwrap(), dur);
729-
return ret.unwrap();;
729+
ret.unwrap()
730730
}
731731

732732
fn get_metadata_section_imp(target: &Target, filename: &Path)

src/librustc/middle/traits/error_reporting.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ pub fn report_selection_error<'a, 'tcx>(infcx: &InferCtxt<'a, 'tcx>,
216216
is_warning, infcx.tcx.sess, obligation.cause.span, E0276,
217217
"the requirement `{}` appears on the impl \
218218
method but not on the corresponding trait method",
219-
obligation.predicate);;
219+
obligation.predicate);
220220
} else {
221221
match obligation.predicate {
222222
ty::Predicate::Trait(ref trait_predicate) => {
@@ -455,7 +455,7 @@ pub fn maybe_report_ambiguity<'a, 'tcx>(infcx: &InferCtxt<'a, 'tcx>,
455455
if !infcx.tcx.sess.has_errors() {
456456
span_err!(infcx.tcx.sess, obligation.cause.span, E0284,
457457
"type annotations required: cannot resolve `{}`",
458-
predicate);;
458+
predicate);
459459
note_obligation_cause(infcx, obligation);
460460
}
461461
}

src/test/run-pass/borrowck-rvalues-mutable.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,5 +39,5 @@ pub fn main() {
3939
assert_eq!(v, 22);
4040

4141
let v = Counter::new(22).inc().inc().get();
42-
assert_eq!(v, 24);;
42+
assert_eq!(v, 24);
4343
}

0 commit comments

Comments
 (0)