Skip to content

Rollup of 5 pull requests #70832

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 15 commits into from
Apr 6, 2020
Merged

Rollup of 5 pull requests #70832

merged 15 commits into from
Apr 6, 2020

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Apr 6, 2020

Successful merges:

Failed merges:

r? @ghost

estebank and others added 15 commits March 28, 2020 13:48
When encountering constraints before type arguments or lifetimes,
suggest the correct order.
If there isn't a rustc in the same directory, then fall back to searching
the path.
Using a single label for constraints and generic arguments.
…ans, r=Centril

Tweak output of type params and constraints in the wrong order

r? @Centril @varkor
…c-unwind-default, r=alexcrichton

Make panic unwind the default for aarch64-*-windows-msvc targets

With the llvm fixes from rust-lang/llvm-project#45 (included as a submodule change) we can enable unwinding by default for these targets.

Fixes rust-lang#65313

There are still a small number of test failures for which we can open individual issues.

r? @alexcrichton
Prefer sysroot from rustc in same directory as rust-gdb

If there isn't a rustc in the same directory, then fall back to searching
the path.
…r=ecstatic-morse

Use smaller span for suggestion restricting lifetime
@Centril Centril added the rollup A PR which is a rollup label Apr 6, 2020
@Centril
Copy link
Contributor Author

Centril commented Apr 6, 2020

@bors r+ p=5 rollup=never

@bors
Copy link
Collaborator

bors commented Apr 6, 2020

📌 Commit 3faec69 has been approved by Centril

@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 Apr 6, 2020
@bors
Copy link
Collaborator

bors commented Apr 6, 2020

⌛ Testing commit 3faec69 with merge af89eb5...

@bors
Copy link
Collaborator

bors commented Apr 6, 2020

☀️ Test successful - checks-azure
Approved by: Centril
Pushing af89eb5 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 6, 2020
@bors bors merged commit af89eb5 into rust-lang:master Apr 6, 2020
@rust-highfive
Copy link
Contributor

📣 Toolstate changed by #70832!

Tested on commit af89eb5.
Direct link to PR: #70832

🎉 rls on linux: test-fail → test-pass (cc @Xanewok).

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Apr 6, 2020
Tested on commit rust-lang/rust@af89eb5.
Direct link to PR: <rust-lang/rust#70832>

🎉 rls on linux: test-fail → test-pass (cc @Xanewok).
@Centril Centril deleted the rollup-ixc09ve branch April 6, 2020 06:46
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
merged-by-bors This PR was explicitly merged by bors. 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.

6 participants