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 10 pull requests #80960

Merged
merged 24 commits into from
Jan 13, 2021
Merged

Rollup of 10 pull requests #80960

merged 24 commits into from
Jan 13, 2021

Conversation

Dylan-DPC-zz
Copy link

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

arora-aman and others added 24 commits November 29, 2020 03:35
Support for both can be useful when creating new firmware, boot loaders,
or embedded operating systems.
This allows us to return borrows of the captured backtrace frames
that are tied to a borrow of the Backtrace itself, instead of to
some short-lived Mutex guard.

It also makes it semantically clearer what synchronization is needed
on the capture.
Per rust-lang#80832, using
--pretty=expanded and --remap-path-prefix results in an ICE.

This is becasue the session source files table is stored in remapped
form, whereas --pretty-expanded looks up unremapped files. This remaps
the path prefixes before lookup.
…2, r=davidtwco,wesleywiser"

This reverts commit ddf2cc7, reversing
changes made to 937f629.
Co-authored-by: Joshua Nelson <[email protected]>
…tebank

diagnostics: Note capturing closures can't be coerced to fns

Fixes rust-lang#72457, fixes rust-lang#71895

r? `@estebank`
Provide more information for HRTB lifetime errors involving closures
Remove redundant def_id lookups

Simplify `DefId -> LocalDefId -> HirId -> LocalDefId -> DefId` chains.
Added support for i386-unknown-linux-gnu and i486-unknown-linux-gnu

Support for both can be useful when creating new firmware, boot loaders,
or embedded operating systems.
use Once instead of Mutex to manage capture resolution

For rust-lang#78299

This allows us to return borrows of the captured backtrace frames that are tied to a borrow of the Backtrace itself, instead of to some short-lived Mutex guard.

We could alternatively share `&Mutex<Capture>`s and lock on-demand, but then we could potentially forget to call `resolve()` before working with the capture. It also makes it semantically clearer what synchronization is needed on the capture.

cc `@seanchen1991` `@rust-lang/project-error-handling`
Update to LLVM 11.0.1

This updates to a new LLVM branch, rebased on the upstream `llvmorg-11.0.1`. All our patches applied cleanly except the fortanix unwind changes, which just needed a small adjustment in cmake files.

r? `@nikic`
Fixes rust-lang#73722
Fix --pretty=expanded with --remap-path-prefix

Per rust-lang#80832, using
--pretty=expanded and --remap-path-prefix results in an ICE.

This is becasue the session source files table is stored in remapped
form, whereas --pretty-expanded looks up unremapped files. This remaps
the path prefixes before lookup.

~~There don't appear to be any existing tests for --pretty=expanded; I'll look into
adding some.~~ Never mind, found the pretty tests.

Fixes rust-lang#80832
…debug, r=wesleywiser

Revert "Auto merge of rust-lang#76896 - spastorino:codegen-inline-fns2

This reverts commit ddf2cc7, reversing
changes made to 937f629.

As `@alexcrichton` pointed out in rust-lang#80916 there's a problem with the taken approach.
Fix rustdoc --test-builder argument parsing

My suggested fix to issue rust-lang#80893. I can actually hook Miri in there now.

I also fixed what I believe to be a typo in the option's help text.
…e, r=petrochenkov

Rename `rustc_middle::lint::LevelSource` to `LevelAndSource`

This continues work in rust-lang#80274 to improve code readability.

This naming follows a pattern seen elsewhere in the compiler (e.g. [`rustc_middle::ty::TypeAndMut`](https://doc.rust-lang.org/nightly/nightly-rustc/rustc_middle/ty/struct.TypeAndMut.html)).
@rustbot rustbot added the rollup A PR which is a rollup label Jan 13, 2021
@Dylan-DPC-zz
Copy link
Author

@bors r+ rollup=never p=5

@bors
Copy link
Contributor

bors commented Jan 13, 2021

📌 Commit 5b90fe1 has been approved by Dylan-DPC

@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 Jan 13, 2021
@bors
Copy link
Contributor

bors commented Jan 13, 2021

⌛ Testing commit 5b90fe1 with merge fc93e47...

@bors
Copy link
Contributor

bors commented Jan 13, 2021

☀️ Test successful - checks-actions
Approved by: Dylan-DPC
Pushing fc93e47 to master...

@rylev
Copy link
Member

rylev commented Jan 20, 2021

There were perf regressions in this rollup. They seem to be largely in llvm so I suspect the update to LLVM 11.01 in #80796 might be to blame.

@rust-timer make-pr-for 330e196

Sign up for free to join this conversation on GitHub. Already have an account? Sign in 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.