Skip to content
New issue

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

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

Already on GitHub? # to your account

Rollup of 6 pull requests #64369

Merged
merged 17 commits into from
Sep 11, 2019
Merged

Rollup of 6 pull requests #64369

merged 17 commits into from
Sep 11, 2019

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Sep 11, 2019

Successful merges:

Failed merges:

r? @ghost

limira and others added 17 commits September 2, 2019 00:14
vxWorks: set DEFAULT_MIN_STACK_SIZE to 256K and use min_stack to pass initial stack size to rtpSpawn
The wasm32-wasi target respects configuration around `crt-static` in
general, but is defaulted to being static. This interacted badly with
code which validated the `cdylib` crate type for `wasm32-wasi`,
erroneously saying that the `cdylib` crate type wasn't supported on
`wasm32-wasi` by default. This commit sets the appropriate flag in
`wasm32_wasi`'s target specification to indicate that the `cdylib` crate
type is supported regardless of `crt-static`

Closes rust-lang#64187
Co-Authored-By: Mazdak Farrokhzad <twingoow@gmail.com>
Improve hygiene of `alloc::format!`

`format` now uses `format_args` though a `__export` module, as described in rust-lang#63687 (comment).

Fixes rust-lang#63687
Replace file_stem by file_name in rustdoc markdown

Before this PR, a file name like `some.file.md` will be output to a file named `some.html` with is not correct because the expected output file must be `some.file.html`
vxWorks: set DEFAULT_MIN_STACK_SIZE to 256K and use min_stack to pass initial stack size to rtpSpawn

vxWorks: set DEFAULT_MIN_STACK_SIZE to 256K and use min_stack to pass initial stack size to rtpSpawn

r? @alexcrichton
cc @n-salim
rustc: Allow the cdylib crate type with wasm32-wasi

The wasm32-wasi target respects configuration around `crt-static` in
general, but is defaulted to being static. This interacted badly with
code which validated the `cdylib` crate type for `wasm32-wasi`,
erroneously saying that the `cdylib` crate type wasn't supported on
`wasm32-wasi` by default. This commit sets the appropriate flag in
`wasm32_wasi`'s target specification to indicate that the `cdylib` crate
type is supported regardless of `crt-static`

Closes rust-lang#64187
Fixed documentation within c_str::from_ptr

Fixed the documentation issue mentioned in rust-lang#63590
…r, r=cramertj

documentation for AtomicPtr CAS operations

The examples in the documentation for AtomicPtr CAS operations only show code that does *not* perform the CAS operation. I suggest to change them so that they actually do exchange the AtomicPtr's value.
@Centril
Copy link
Contributor Author

Centril commented Sep 11, 2019

@bors r+ p=6 rollup=never

@bors
Copy link
Collaborator

bors commented Sep 11, 2019

📌 Commit 4f1d50e has been approved by Centril

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Sep 11, 2019
@bors
Copy link
Collaborator

bors commented Sep 11, 2019

⌛ Testing commit 4f1d50e with merge 74d5c70...

bors added a commit that referenced this pull request Sep 11, 2019
Rollup of 6 pull requests

Successful merges:

 - #64060 (Improve hygiene of `alloc::format!`)
 - #64072 (Replace file_stem by file_name in rustdoc markdown)
 - #64129 (vxWorks: set DEFAULT_MIN_STACK_SIZE to 256K and use min_stack to pass initial stack size to rtpSpawn)
 - #64188 (rustc: Allow the cdylib crate type with wasm32-wasi)
 - #64326 (Fixed documentation within c_str::from_ptr)
 - #64349 (documentation for AtomicPtr CAS operations)

Failed merges:

r? @ghost
@bors
Copy link
Collaborator

bors commented Sep 11, 2019

☀️ Test successful - checks-azure
Approved by: Centril
Pushing 74d5c70 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Sep 11, 2019
@bors bors merged commit 4f1d50e into rust-lang:master Sep 11, 2019
@Centril Centril deleted the rollup-g875ozi branch September 11, 2019 08:39
@Centril Centril added the rollup A PR which is a rollup label Oct 2, 2019
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants