Skip to content
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.

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

Rollup of 23 pull requests #58189

Merged
merged 53 commits into from
Feb 5, 2019
Merged

Rollup of 23 pull requests #58189

merged 53 commits into from
Feb 5, 2019

Conversation

kennytm
Copy link
Member

@kennytm kennytm commented Feb 5, 2019

Successful merges:

Failed merges:

r? @ghost

pnkfelix and others added 30 commits January 30, 2019 15:12
This requires a pre-pass over the input streams. But that is cheap
compared to the quadratic blowup associated with reallocating the
accumulating vector on-the-fly.
The phrase "... or some similar thing." is very vague and contributes nothing to understanding the example. Simply removed.
Some confusion about split popped up at https://news.ycombinator.com/item?id=19080931 since the docs sorta sound like `&str`, `char` and closures are the only types that can be patterns.

cc @steveklabnik
libfmt_macros => 2018

Transitions `libfmt_macros` to Rust 2018; cc rust-lang#58099

r? @oli-obk
libgraphviz => 2018

Transitions `libgraphviz` to Rust 2018; cc rust-lang#58099

r? @oli-obk
Add NVPTX target to a build manifest

Include `nvptx64-nvidia-cuda` target to a build manifest. I forgot this step at my first take on adding the target (rust-lang#57937).

Hopefully, this is the only reason why `rustup target add nvptx64-nvidia-cuda` doesn't work 🙁

r? @alexcrichton
…i-obk

librustc_privacy => 2018

Transitions `librustc_privacy` to Rust 2018; cc rust-lang#58099

r? @oli-obk
libpanic_abort => 2018

Transitions `libpanic_abort` to Rust 2018; cc rust-lang#58099

r? @oli-obk
…excrichton

Transition build-manifest to 2018 edition

rust-lang#58099
…18, r=Centril

Transition tidy and unstable-book-gen to 2018 edition

Transitions tidy and unstable-book-gen to Rust 2018; cc rust-lang#58099
…r=petrochenkov

Include the span of attributes of the lhs to the span of the assignment expression

This PR adds the span of attributes of the lhs to the span of the assignment expression. Currently with the following code, `#[attr]` is not included to the span of the assignment (`foo = true`).

```rust
#[attr]
foo = true;
```
The rational behind this change is that as libsyntax user I expect the span of the parent node includes every span of child nodes.

cc rust-lang/rustfmt#3313, rust-lang#15701.
…tril

Transition rustdoc-theme to 2018 edition

Transitions rustdoc-theme to Rust 2018; cc rust-lang#58099
libunwind => 2018

Transitions `libunwind` to Rust 2018; cc rust-lang#58099

r? @Centril
…Zoxc

hir: add more HirId methods

Adds a few more methods operating on `HirId` instead of `NodeId` with the intention of replacing the old ones in the near future.

r? @Zoxc
Remove weasel word in docs for iter's take_while()

The phrase "... or some similar thing." is very vague and contributes nothing to understanding the example. Simply removed.
Remove stray FIXME

These were copied from the WebAssembly implementation, and later commented. There is nothing to be fixed, RWLock is Send/Sync because all member fields are Send/Sync.

r? @joshtriplett
Add more debugging code to track down appveyor 259 exit code

cc rust-lang#58160
r? @alexcrichton
Update contributor name in .mailmap

following up on email correspondence with @steveklabnik
update split docs

Some confusion about split popped up at https://news.ycombinator.com/item?id=19080931 since the docs sorta sound like `&str`, `char` and closures are the only types that can be patterns.

cc @steveklabnik
…=joshtriplett

SGX target: handle empty user buffers correctly

Also, expose correct items in `os::fortanix_sgx::usercalls::alloc`

* [read_alloc documentation](https://edp.fortanix.com/docs/api/fortanix_sgx_abi/struct.Usercalls.html#method.read_alloc)
* [Clarified ByteBuffer documentation](https://github.com/fortanix/rust-sgx/pull/94/files#diff-ca843ad9e25cacd63a80579c0f7efa56)

r? @joshtriplett
@kennytm
Copy link
Member Author

kennytm commented Feb 5, 2019

@bors r+ p=23

@bors
Copy link
Contributor

bors commented Feb 5, 2019

📌 Commit c23871a has been approved by kennytm

@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 Feb 5, 2019
@bors
Copy link
Contributor

bors commented Feb 5, 2019

⌛ Testing commit c23871a with merge 8bf7fda...

bors added a commit that referenced this pull request Feb 5, 2019
Rollup of 23 pull requests

Successful merges:

 - #58001 (proc_macro: make `TokenStream::from_streams` pre-allocate its vector.)
 - #58096 (Transition linkchecker to 2018 edition)
 - #58097 (Transition remote test to Rust 2018)
 - #58106 (libfmt_macros => 2018)
 - #58107 (libgraphviz => 2018)
 - #58108 (Add NVPTX target to a build manifest)
 - #58109 (librustc_privacy => 2018)
 - #58112 (libpanic_abort => 2018)
 - #58113 (Transition build-manifest to 2018 edition)
 - #58114 (Transition tidy and unstable-book-gen to 2018 edition)
 - #58116 (Include the span of attributes of the lhs to the span of the assignment expression)
 - #58117 (Transition rustdoc-theme to 2018 edition)
 - #58128 (libunwind => 2018)
 - #58138 (Fix #58101)
 - #58139 (hir: add more HirId methods)
 - #58141 (Remove weasel word in docs for iter's take_while())
 - #58142 (Remove stray FIXME)
 - #58145 (Add #[must_use] to core::task::Poll)
 - #58162 (Add more debugging code to track down appveyor 259 exit code)
 - #58169 (Update contributor name in .mailmap)
 - #58172 (update split docs)
 - #58182 (SGX target: handle empty user buffers correctly)
 - #58186 (Add Rustlings to the doc index)

Failed merges:

r? @ghost
@bors
Copy link
Contributor

bors commented Feb 5, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: kennytm
Pushing 8bf7fda to master...

@bors bors merged commit c23871a into rust-lang:master Feb 5, 2019
@Centril Centril added the rollup A PR which is a rollup label Oct 2, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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