Skip to content

Commit

Permalink
Auto merge of #28724 - tsion:remove-double-semicolons, r=alexcrichton
Browse files Browse the repository at this point in the history
Really minor code cleanup, because why not?
  • Loading branch information
bors committed Sep 30, 2015
2 parents 15db6ec + 55e4842 commit 44d4048
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion src/libcollectionstest/string.rs
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ fn test_str_add() {

#[test]
fn remove() {
let mut s = "ศไทย中华Việt Nam; foobar".to_string();;
let mut s = "ศไทย中华Việt Nam; foobar".to_string();
assert_eq!(s.remove(0), 'ศ');
assert_eq!(s.len(), 33);
assert_eq!(s, "ไทย中华Việt Nam; foobar");
Expand Down
2 changes: 1 addition & 1 deletion src/librustc/metadata/loader.rs
Original file line number Diff line number Diff line change
Expand Up @@ -726,7 +726,7 @@ fn get_metadata_section(target: &Target, filename: &Path)
ret = Some(get_metadata_section_imp(target, filename));
});
info!("reading {:?} => {:?}", filename.file_name().unwrap(), dur);
return ret.unwrap();;
ret.unwrap()
}

fn get_metadata_section_imp(target: &Target, filename: &Path)
Expand Down
4 changes: 2 additions & 2 deletions src/librustc/middle/traits/error_reporting.rs
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ pub fn report_selection_error<'a, 'tcx>(infcx: &InferCtxt<'a, 'tcx>,
is_warning, infcx.tcx.sess, obligation.cause.span, E0276,
"the requirement `{}` appears on the impl \
method but not on the corresponding trait method",
obligation.predicate);;
obligation.predicate);
} else {
match obligation.predicate {
ty::Predicate::Trait(ref trait_predicate) => {
Expand Down Expand Up @@ -455,7 +455,7 @@ pub fn maybe_report_ambiguity<'a, 'tcx>(infcx: &InferCtxt<'a, 'tcx>,
if !infcx.tcx.sess.has_errors() {
span_err!(infcx.tcx.sess, obligation.cause.span, E0284,
"type annotations required: cannot resolve `{}`",
predicate);;
predicate);
note_obligation_cause(infcx, obligation);
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/test/run-pass/borrowck-rvalues-mutable.rs
Original file line number Diff line number Diff line change
Expand Up @@ -39,5 +39,5 @@ pub fn main() {
assert_eq!(v, 22);

let v = Counter::new(22).inc().inc().get();
assert_eq!(v, 24);;
assert_eq!(v, 24);
}

0 comments on commit 44d4048

Please sign in to comment.