Skip to content

Rollup of 8 pull requests - #45386

Merged
bors merged 19 commits into
rust-lang:masterfrom
kennytm:rollup
Oct 19, 2017
Merged

Rollup of 8 pull requests#45386
bors merged 19 commits into
rust-lang:masterfrom
kennytm:rollup

Conversation

bgermannand others added 11 commits October 17, 2017 15:53
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!
Closesrust-lang#41299
Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
@rust-highfive

Copy link
Copy Markdown
Contributor

r? @nikomatsakis

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

@kennytm

Copy link
Copy Markdown
MemberAuthor

@bors r+ p=9

@bors

bors commented Oct 19, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit 5f13ec9 has been approved by kennytm

@kennytmkennytm added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Oct 19, 2017
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 fixrust-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!
Closesrust-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
@kennytmkennytm changed the title Rollup of 9 pull requestsRollup of 8 pull requestsOct 19, 2017
@kennytm

Copy link
Copy Markdown
MemberAuthor

@bors r+

Removed #45080, not intended for rollup.

@bors

bors commented Oct 19, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit 4371862 has been approved by kennytm

bors added a commit that referenced this pull request Oct 19, 2017
Rollup of 8 pull requests
- Successful merges: #45343, #45349, #45352, #45374, #45375, #45376, #45377, #45382
- Failed merges:
@bors

bors commented Oct 19, 2017

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 4371862 with merge 439f752...

@bors

bors commented Oct 19, 2017

Copy link
Copy Markdown
Collaborator

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

@bors
bors merged commit 4371862 into rust-lang:masterOct 19, 2017
@CentrilCentril added the rollup A PR which is a rollup label Oct 2, 2019
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

rollupA PR which is a rollupS-waiting-on-borsStatus: 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.

10 participants

@kennytm@rust-highfive@bors@nikomatsakis@Centril@bgermann@pvdrz@alexcrichton@topecongiro@Keruspe