about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2019-08-19 20:49:39 +0000
committerbors <bors@rust-lang.org>2019-08-19 20:49:39 +0000
commitc1b08dd26036e14f061b99b20cd6f169e29046f3 (patch)
tree2a436944507cd0f934892d37120557784006d92d /src/libstd
parent29a54035c77cb2ba7ea2c24b2437760d0495a2c8 (diff)
parentac345942097cf27c7b07550fc3f955d198da0021 (diff)
downloadrust-c1b08dd26036e14f061b99b20cd6f169e29046f3.tar.gz
rust-c1b08dd26036e14f061b99b20cd6f169e29046f3.zip
Auto merge of #63715 - Centril:rollup-dga8qtp, r=Centril
Rollup of 5 pull requests

Successful merges:

 - #63252 (Remove recommendation about idiomatic syntax for Arc::clone)
 - #63376 (use different lifetime name for object-lifetime-default elision)
 - #63620 (Use constraint span when lowering associated types)
 - #63699 (Fix suggestion from incorrect `move async` to `async move`.)
 - #63704 ( Fixed: error: unnecessary trailing semicolon)

Failed merges:

r? @ghost
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/sys/vxworks/process/process_common.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/sys/vxworks/process/process_common.rs b/src/libstd/sys/vxworks/process/process_common.rs
index 397200c39c2..ba797354a73 100644
--- a/src/libstd/sys/vxworks/process/process_common.rs
+++ b/src/libstd/sys/vxworks/process/process_common.rs
@@ -155,7 +155,7 @@ impl Command {
         _f: Box<dyn FnMut() -> io::Result<()> + Send + Sync>,
     ) {
         // Fork() is not supported in vxWorks so no way to run the closure in the new procecss.
-        unimplemented!();;
+        unimplemented!();
     }
 
     pub fn stdin(&mut self, stdin: Stdio) {