diff options
| author | Artyom Pavlov <newpavlov@gmail.com> | 2019-08-20 10:08:57 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-20 10:08:57 +0000 |
| commit | e500fc3171a899f713a269ccee6f480b9db4859b (patch) | |
| tree | 8aa95c5dd723ddc09ffbe724c44cb701f8bde7e5 /src/libstd | |
| parent | 34c9f8c6490bb1179c504bccd51b2827c05f10db (diff) | |
| parent | 7858dc237d70fc0c5a31eb528dfab1ad0baf6a27 (diff) | |
| download | rust-e500fc3171a899f713a269ccee6f480b9db4859b.tar.gz rust-e500fc3171a899f713a269ccee6f480b9db4859b.zip | |
Merge branch 'master' into redox_builder
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/Cargo.toml | 2 | ||||
| -rw-r--r-- | src/libstd/sys/vxworks/process/process_common.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/Cargo.toml b/src/libstd/Cargo.toml index 3288d0b4df2..bb77a5bdea4 100644 --- a/src/libstd/Cargo.toml +++ b/src/libstd/Cargo.toml @@ -26,7 +26,7 @@ unwind = { path = "../libunwind" } hashbrown = { version = "0.5.0", features = ['rustc-dep-of-std'] } [dependencies.backtrace] -version = "0.3.34" +version = "0.3.35" default-features = false # don't use coresymbolication on OSX features = [ "rustc-dep-of-std", # enable build support for integrating into libstd 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) { |