Skip to content

Rollup of 5 pull requests #42573

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

Merged
merged 10 commits into from
Jun 10, 2017
Merged

Rollup of 5 pull requests #42573

merged 10 commits into from
Jun 10, 2017

Conversation

Manishearth and others added 10 commits June 2, 2017 10:59
Make rustdoc.js use license comments.

This will ensure that JS minifiers and the like will preserve the license statement even after minimisation.
Vec<T> is pronounced 'vec'

I've never heard it pronounced "vector". Is this an outdated recommendation?

(or have I been doing it wrong all this time)

r? @steveklabnik
…=nagisa

Ignore variadic FFI test on AArch64

I've cross compiled Rust to `aarch64-linux-gnu`, and tried to run the compile-fail tests, but `variadic-ffi.rs` fails with the following error:

```
The ABI `"stdcall"` is not supported for the current target [E0570]
```

The test seems to be ignored on (32-bit) ARM, so I turned it off for AArch64 too.
…r=steveklabnik

doc: a more complete explanation, and a better example
@rust-highfive
Copy link
Contributor

Some changes occurred in HTML/CSS.

cc @GuillaumeGomez

@rust-highfive
Copy link
Contributor

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @GuillaumeGomez (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

@frewsxcv
Copy link
Member Author

frewsxcv commented Jun 9, 2017

@bors r+ p=10

@bors
Copy link
Collaborator

bors commented Jun 9, 2017

📌 Commit 3be7f8b has been approved by frewsxcv

@bors
Copy link
Collaborator

bors commented Jun 9, 2017

⌛ Testing commit 3be7f8b with merge 60ac9f4...

bors added a commit that referenced this pull request Jun 9, 2017
Rollup of 5 pull requests

- Successful merges: #42307, #42385, #42531, #42551, #42558
- Failed merges:
@bors
Copy link
Collaborator

bors commented Jun 10, 2017

☀️ Test successful - status-appveyor, status-travis
Approved by: frewsxcv
Pushing 60ac9f4 to master...

@bors bors merged commit 3be7f8b into rust-lang:master Jun 10, 2017
@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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants