diff options
| author | newpavlov <newpavlov@gmail.com> | 2019-08-20 19:04:16 +0300 |
|---|---|---|
| committer | newpavlov <newpavlov@gmail.com> | 2019-08-20 19:04:16 +0300 |
| commit | 7daf890d752c79b554528716fedd5f0b9abc8914 (patch) | |
| tree | 4d04c68033ea897a51ea0bab86688baac59179d1 /src/libstd | |
| parent | 744442d19a76c4dd39f5fa2a2bbd74638e8569ec (diff) | |
| parent | 14890954ce17c44d944eda988c5a64bb4c5ec9eb (diff) | |
| download | rust-7daf890d752c79b554528716fedd5f0b9abc8914.tar.gz rust-7daf890d752c79b554528716fedd5f0b9abc8914.zip | |
Merge branch 'master' into wasi
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) { |