Rollup of 8 pull requests #45386
Merged
Rollup of 8 pull requests #45386
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Member
kennytm
commented
Oct 19, 2017
•
kennytm
commented
- Successful merges: Make Solaris builder compatible with Solaris 10 retry #45343, added examples of closures for str::find #45349, test: Update Emscripten failures/passing #45352, Remove --enable-rustbuild config option from an example #45374, Allow passing a path with tilde to the configure script #45375, Fix typos in src/librustc/README.md #45376, Fix typos in librustc/ty/README.md #45377, rustbuild: fix dist in debug mode #45382
- Failed merges:
Unfortunately, rust-lang#45255 does not quite cut it, so use a different approach to have Solaris 10 compatibility by tricking libbacktrace's autoconf tests. The sysroot download routine is slightly changed, too.
All tests should now have annotation for *why* they're ignored on emscripten. A few tests no longer need such an annotation as well! Closes rust-lang#41299
Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
|
(rust_highfive has picked a reviewer for you, use r? to override) |
|
@bors r+ p=9 |
|
📌 Commit 5f13ec9 has been approved by |
kennytm
added
the
S-waiting-on-bors
Make Solaris builder compatible with Solaris 10 retry Unfortunately, rust-lang#45255 does not quite cut it, so use a different approach to have Solaris 10 compatibility by tricking libbacktrace's autoconf tests. The sysroot download routine is slightly changed, too.
…r=steveklabnik added examples of closures for str::find This is an attempt to fix rust-lang#45327 r? @steveklabnik
…komatsakis test: Update Emscripten failures/passing All tests should now have annotation for *why* they're ignored on emscripten. A few tests no longer need such an annotation as well! Closes rust-lang#41299
…-config-option, r=Mark-Simulacrum Remove --enable-rustbuild config option from an example `--enable-rustbuild` is no longer recognized by the configure script. Also I think we should use `./configure` and `./x.py` instead of `configure` and `../x.py`.
…mulacrum Allow passing a path with tilde to the configure script Currently `./configure --local-rust-root=~/.cargo --enable-local-rebuild` fails with ``` Exception: no cargo executable found at `~/.cargo//bin/cargo` ```
…Mark-Simulacrum Fix typos in src/librustc/README.md
…EADME, r=kennytm Fix typos in librustc/ty/README.md
rustbuild: fix dist in debug mode In debug mode, the artifacts are placed in "debug", so don't hardcode "release" and use our helper to get the right directory name
|
📌 Commit 4371862 has been approved by |
bors
added a commit
that referenced
this pull request
Oct 19, 2017
|
☀️ Test successful - status-appveyor, status-travis |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.