8000 Rollup of 10 pull requests by Centril · Pull Request #64137 · rust-lang/rust · GitHub
[go: up one dir, main page]
Skip to content

Rollup of 10 pull requests #64137

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 32 commits into from
Closed

Rollup of 10 pull requests #64137

Changes from 1 commit
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
a0ab5a3
Add Result::cloned{,_err} and Result::copied{,_err}
ksqsf Jul 31, 2019
c784720
Fix issue and impl
ksqsf Jul 31, 2019
5a36b0d
Make these methods public
ksqsf Jul 31, 2019
6c13081
Rename {copied,cloned} to {copied,cloned}_ok, and add {copied,cloned}…
ksqsf Jul 31, 2019
4b2f598
Revert "cloned/copied"
ksqsf Aug 1, 2019
9733f0d
Fix doc tests
ksqsf Aug 1, 2019
61e5286
Remove Err variants of cloned and copied
ksqsf Aug 2, 2019
b2b9b81
Account for doc comments coming from proc macros without spans
estebank Aug 27, 2019
7ed542d
add regression test
estebank Aug 27, 2019
820aa5b
Stabilize pin_into_inner in 1.39.0
ghedo Aug 28, 2019
5da1123
Update zx_time_t to an i64
tmandry Aug 30, 2019
403701f
Don't try to use /dev/null on Fuchsia
tmandry Aug 30, 2019
7bfa2be
fuchsia: Don't fail to spawn if no stdin exists
tmandry Aug 31, 2019
5f91ad0
fuchsia: Fix default environment behavior when spawning
tmandry Aug 31, 2019
3c4d157
Fix unlock ordering in SGX synchronization primitives
Aug 31, 2019
754a875
Add some more tests for underscore imports
matthewjasper Aug 31, 2019
b0bb301
Update xLTO compatibility table in rustc book.
michaelwoerister Sep 2, 2019
8c74eb7
Move path parsing earlier.
nnethercote Sep 3, 2019
23c76ff
Added warning around code with reference to uninit bytes
Sep 3, 2019
b03d3dc
Changed comment to better reflect std's exceptional situation
Sep 3, 2019
fa893a3
use TokenStream rather than &[TokenTree] for built-in macros
matklad Aug 31, 2019
6136495
use consistent naming for buildin expansion functions
matklad Sep 3, 2019
091e975
Rollup merge of #63166 - ksqsf:master, r=alexcrichton
Centril Sep 4, 2019
128baa4
Rollup merge of #63930 - estebank:rustdoc-ice, r=GuillaumeGomez
Centril Sep 4, 2019
820a380
Rollup merge of #63985 - ghedo:stabilize_pin_into_inner, r=alexcrichton
Centril Sep 4, 2019
e9160d0
Rollup merge of #64023 - tmandry:libstd-fuchsia-fixes, r=cramertj
Centril Sep 4, 2019
7d45eaf
Rollup merge of #64030 - jethrogb:jb/sgx-sync-issues, r=alexcrichton
Centril Sep 4, 2019
c334526
Rollup merge of #64041 - matklad:token-stream-tt, r=petrochenkov
Centril Sep 4, 2019
04bf85d
Rollup merge of #64043 - matthewjasper:underscore-import-tests, r=ale…
Centril Sep 4, 2019
2df6c7b
Rollup merge of #64092 - michaelwoerister:update-xlto-table-rustc-boo…
Centril Sep 4, 2019
7cd097e
Rollup merge of #64120 - nnethercote:move-path-parsing-earlier, r=pet…
Centril Sep 4, 2019
3a68bee
Rollup merge of #64123 - danielhenrymantilla:add_comment_about_uninit…
Centril Sep 4, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fuchsia: Fix default environment behavior when spawning
  • Loading branch information
@tmandry
tmandry committed Aug 31, 2019
commit 5f91ad0e3300c36033bf409ceefb00480fecbed3
7 changes: 5 additions & 2 deletions src/libstd/sys/unix/process/process_fuchsia.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,10 @@ impl Command {
use crate::sys::process::zircon::*;

let envp = match maybe_envp {
Some(envp) => envp.as_ptr(),
// None means to clone the current environment, which is done in the
// flags below.
None => ptr::null(),
Some(envp) => envp.as_ptr(),
};

let make_action = |local_io: &ChildStdio, target_fd| -> io::Result<fdio_spawn_action_t> {
Expand Down Expand Up @@ -104,7 +106,8 @@ impl Command {
let mut process_handle: zx_handle_t = 0;
zx_cvt(fdio_spawn_etc(
ZX_HANDLE_INVALID,
FDIO_SPAWN_CLONE_JOB | FDIO_SPAWN_CLONE_LDSVC | FDIO_SPAWN_CLONE_NAMESPACE,
FDIO_SPAWN_CLONE_JOB | FDIO_SPAWN_CLONE_LDSVC | FDIO_SPAWN_CLONE_NAMESPACE
| FDIO_SPAWN_CLONE_ENVIRON, // this is ignored when envp is non-null
self.get_argv()[0], self.get_argv().as_ptr(), envp,
actions.len() as size_t, actions.as_ptr(),
&mut process_handle,
Expand Down
0