diff options
| author | bors <bors@rust-lang.org> | 2015-09-30 03:24:00 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-09-30 03:24:00 +0000 |
| commit | 44d404804c85cb80d4f5e32ec7fc3df43f255a14 (patch) | |
| tree | fb3b9253078c3b654c56a1a9f4bd54fb47e1e795 | |
| parent | 15db6ec5714dffab7b36db44de9ece5e76301e04 (diff) | |
| parent | 55e48420dbd9adbf695061ec7a92266284621d2d (diff) | |
| download | rust-44d404804c85cb80d4f5e32ec7fc3df43f255a14.tar.gz rust-44d404804c85cb80d4f5e32ec7fc3df43f255a14.zip | |
Auto merge of #28724 - tsion:remove-double-semicolons, r=alexcrichton
Really minor code cleanup, because why not?
| -rw-r--r-- | src/libcollectionstest/string.rs | 2 | ||||
| -rw-r--r-- | src/librustc/metadata/loader.rs | 2 | ||||
| -rw-r--r-- | src/librustc/middle/traits/error_reporting.rs | 4 | ||||
| -rw-r--r-- | src/test/run-pass/borrowck-rvalues-mutable.rs | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/libcollectionstest/string.rs b/src/libcollectionstest/string.rs index 69553bff0e1..89df77d074f 100644 --- a/src/libcollectionstest/string.rs +++ b/src/libcollectionstest/string.rs @@ -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"); diff --git a/src/librustc/metadata/loader.rs b/src/librustc/metadata/loader.rs index 99d1eaebdb2..77092d0802f 100644 --- a/src/librustc/metadata/loader.rs +++ b/src/librustc/metadata/loader.rs @@ -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) diff --git a/src/librustc/middle/traits/error_reporting.rs b/src/librustc/middle/traits/error_reporting.rs index 43b3831604b..a54818b2b53 100644 --- a/src/librustc/middle/traits/error_reporting.rs +++ b/src/librustc/middle/traits/error_reporting.rs @@ -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) => { @@ -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); } } diff --git a/src/test/run-pass/borrowck-rvalues-mutable.rs b/src/test/run-pass/borrowck-rvalues-mutable.rs index 045e8d952ad..93cb0cb0af2 100644 --- a/src/test/run-pass/borrowck-rvalues-mutable.rs +++ b/src/test/run-pass/borrowck-rvalues-mutable.rs @@ -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); } |