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 7 pull requests #45532

Merged
merged 16 commits into from
Oct 26, 2017
Merged

Rollup of 7 pull requests #45532

merged 16 commits into from
Oct 26, 2017

Conversation

tmccombs and others added 16 commits October 6, 2017 01:15
Due to rust-lang/cargo#4570, a `*.dll.lib` file is uplifted when building
dynamic libraries on Windows. The current bootstrap code does not
understand files with multiple extensions, and will instead assume
`xxxx.dll` is the file name. This caused a `no output generated` error
because it tries to search for `xxxx.dll-hash.lib` inside the `deps/`
folder, while it should check for `xxxx-hash.dll.lib` instead.

This PR is blocking rust-lang#45285 (Bump to 1.23 and update bootstrap).
Similar to rust-lang#36994, rust programs segfault on SPARC64 Solaris machines.
This was accidentally added in rust-lang#45352, forgot to back it out!
…etMisdreavus

Limit the sidebar height

The sidebar is now fixed, which means its scrolling is independent of the main page now.

r? @rust-lang/docs
Correct misspelling in error text: re-assignment => reassignment

[reassignment is the correct spelling](https://www.thefreedictionary.com/reassignment) rather than re-assignment; this error message looks silly in the book next to text trying to be grammatically correct :-/

Will this cause any stability/backcompat type issues?
Implement Hash for raw pointers to unsized types

This is useful for some niche cases, like a hash table of slices or trait objects where the key is the raw pointer.  Example use case: https://docs.rs/by_address
…ck, r=alexcrichton

rustbuild: Fix `no output generated` error for next bootstrap cargo.

Due to rust-lang/cargo#4570, a `*.dll.lib` file is uplifted when building dynamic libraries on Windows. The current bootstrap code does not understand files with multiple extensions, and will instead assume `xxxx.dll` is the file name. This caused a `no output generated` error because it tries to search for `xxxx.dll-hash.lib` inside the `deps/` folder, while it should check for `xxxx-hash.dll.lib` instead.

This PR is blocking rust-lang#45285, see rust-lang#45285 (comment) and the rest of the comments for detail.
Disable jemalloc for sparcv9-sun-solaris

Similar to rust-lang#36994, rust programs segfault on SPARC64 Solaris machines.
ci: Test more asmjs again

This was accidentally added in rust-lang#45352, forgot to back it out!
@rust-highfive
Copy link
Collaborator

Some changes occurred in HTML/CSS.

cc @GuillaumeGomez

@rust-highfive
Copy link
Collaborator

r? @dtolnay

(rust_highfive has picked a reviewer for you, use r? to override)

@kennytm
Copy link
Member Author

kennytm commented Oct 25, 2017

@bors r+ p=7

@bors
Copy link
Contributor

bors commented Oct 25, 2017

📌 Commit 851d1c7 has been approved by kennytm

@kennytm kennytm added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Oct 25, 2017
bors added a commit that referenced this pull request Oct 25, 2017
Rollup of 7 pull requests

- Successful merges: #45059, #45212, #45398, #45483, #45496, #45508, #45526
- Failed merges:
@bors
Copy link
Contributor

bors commented Oct 25, 2017

⌛ Testing commit 851d1c7 with merge e847f30...

@dtolnay dtolnay removed their assignment Oct 26, 2017
@bors
Copy link
Contributor

bors commented Oct 26, 2017

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

@bors bors mentioned this pull request Oct 26, 2017
@bors bors merged commit 851d1c7 into rust-lang:master Oct 26, 2017
@kennytm kennytm deleted the rollup branch October 26, 2017 05:46
@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
Development

Successfully merging this pull request may close these issues.