diff options
| author | Corey Farwell <coreyf@rwell.org> | 2017-05-26 10:20:25 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-26 10:20:25 -0400 |
| commit | 21882103d456d3ea0f91c6392164a285d113c587 (patch) | |
| tree | 0eafdc6d77a45d7c385d9c23f72c63274994a586 | |
| parent | 7e47327d90ad9ee61f0284146387af25b11bd0f4 (diff) | |
| parent | 94b074f581d9b6ba4ca8a40a1a52a17a8e532a3f (diff) | |
| download | rust-21882103d456d3ea0f91c6392164a285d113c587.tar.gz rust-21882103d456d3ea0f91c6392164a285d113c587.zip | |
Rollup merge of #42215 - callahad:remove-superfluous-semis, r=Mark-Simulacrum
Remove superfluous `;;` sequences Ran across a doubled `;;` in the docstring for `str::split`. Grep found a few more. :)
| -rw-r--r-- | src/libcollections/str.rs | 2 | ||||
| -rw-r--r-- | src/librustc_passes/consts.rs | 2 | ||||
| -rw-r--r-- | src/librustc_trans/mir/block.rs | 2 | ||||
| -rw-r--r-- | src/test/run-pass/issue-16671.rs | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/libcollections/str.rs b/src/libcollections/str.rs index 7e67befb700..3ea2050619b 100644 --- a/src/libcollections/str.rs +++ b/src/libcollections/str.rs @@ -1018,7 +1018,7 @@ impl str { /// /// ``` /// let x = "(///)".to_string(); - /// let d: Vec<_> = x.split('/').collect();; + /// let d: Vec<_> = x.split('/').collect(); /// /// assert_eq!(d, &["(", "", "", ")"]); /// ``` diff --git a/src/librustc_passes/consts.rs b/src/librustc_passes/consts.rs index 25845c5768e..698850f0e9e 100644 --- a/src/librustc_passes/consts.rs +++ b/src/librustc_passes/consts.rs @@ -141,7 +141,7 @@ impl<'a, 'tcx> Visitor<'tcx> for CheckCrateVisitor<'a, 'tcx> { let outer_penv = self.tcx.infer_ctxt(body_id, Reveal::UserFacing).enter(|infcx| { let param_env = infcx.param_env.clone(); let outer_penv = mem::replace(&mut self.param_env, param_env); - let region_maps = &self.tcx.region_maps(item_def_id);; + let region_maps = &self.tcx.region_maps(item_def_id); euv::ExprUseVisitor::new(self, region_maps, &infcx).consume_body(body); outer_penv }); diff --git a/src/librustc_trans/mir/block.rs b/src/librustc_trans/mir/block.rs index d94d7f4430b..a3fa1279ffb 100644 --- a/src/librustc_trans/mir/block.rs +++ b/src/librustc_trans/mir/block.rs @@ -901,7 +901,7 @@ impl<'a, 'tcx> MirContext<'a, 'tcx> { let llty = type_of::type_of(bcx.ccx, val.ty); let cast_ptr = bcx.pointercast(dst.llval, llty.ptr_to()); let in_type = val.ty; - let out_type = dst.ty.to_ty(bcx.tcx());; + let out_type = dst.ty.to_ty(bcx.tcx()); let llalign = cmp::min(bcx.ccx.align_of(in_type), bcx.ccx.align_of(out_type)); self.store_operand(bcx, cast_ptr, Some(llalign), val); } diff --git a/src/test/run-pass/issue-16671.rs b/src/test/run-pass/issue-16671.rs index 71a19d98190..49dc970ba3f 100644 --- a/src/test/run-pass/issue-16671.rs +++ b/src/test/run-pass/issue-16671.rs @@ -13,7 +13,7 @@ fn foo<F: FnOnce()>(_f: F) { } fn main() { - let mut var = Vec::new();; + let mut var = Vec::new(); foo(move|| { var.push(1); }); |
