Skip to content

Rollup of 8 pull requests #69919

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 48 commits into from
Mar 11, 2020
Merged

Rollup of 8 pull requests #69919

merged 48 commits into from
Mar 11, 2020

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Mar 11, 2020

Successful merges:

Failed merges:

r? @ghost

chrissimpkins and others added 30 commits February 29, 2020 23:54
Centril and others added 16 commits March 10, 2020 08:35
In CTFE heavy code, checking the env var everytime is inefficient. We
can do a lot better by using a `Session` variable instead.
Changed functions:
* LLVMRustGetOrInsertFunction
* LLVMRustGetNamedValue
* LLVMRustBuildCall (removed unused name argument)
* LLVMRustInlineAsm
* LLVMRustInlineAsmVerify
* LLVMRustAppendModuleInlineAsm
…r=ollie27

--show-coverage json

The purpose of this change is to be able to use it as a tool in docs.rs in order to provide some more stats to crates' owners. Eventually even create a badge or something along the line.

r? @QuietMisdreavus
…etrochenkov

tidy: replace `make check` with `./x.py test` in documentation

This PR includes a minor documentation update for tidy.  It replaces the `make check` approach with `./x.py test` and describes how to execute the tidy checks (only) with ~~`./x.py test src/tools/tidy`~~ `./x.py test tidy`.
Improve expression & attribute parsing

This PR includes misc improvements to expression and attribute parsing.

1. Some code simplifications
2. Better recovery for various block forms, e.g. `loop statements }` (missing `{` after `loop`). (See e.g., `block-no-opening-brace.rs` among others for examples.)
3. Added recovery for e.g., `unsafe $b` where `$b` refers to a `block` macro fragment. (See `bad-interpolated-block.rs` for examples.)
4. ^--- These are done so that code sharing in block parsing is increased.
5. Added recovery for e.g., `'label: loop { ... }` (See `labeled-no-colon-expr.rs`.)
6. Added recovery for e.g., `&'lifetime expr` (See `regions-out-of-scope-slice.rs`.)
7. Added recovery for e.g., `fn foo() = expr;` (See `fn-body-eq-expr-semi.rs`.)
8. Simplified attribute parsing code & slightly improved diagnostics.
9. Added recovery for e.g., `Box<('a) + Trait>`.
10. Added recovery for e.g, `if true #[attr] {} else #[attr] {} else #[attr] if true {}`.

r? @estebank
fix memory leak when vec::IntoIter panics during drop

Fixes rust-lang#69770
panic_bounds_check: use caller_location, like PanicFnLangItem

The `PanicFnLangItem` got switched to using `#[caller_location]` at some point, but `PanicBoundsCheckFnLangItem` was kept in the old style. For consistency, switch that one over to use `#[caller_location]` as well.

This is also helpful for Miri as it means the `assert_panic` machine hook never needs to know the current `Span`.
…error-code-e0739, r=Dylan-DPC

Add long error explanation for E0739

Add long explanation for the E0739 error code
Part of rust-lang#61137

r? @GuillaumeGomez
…to_session_var, r=RalfJung

[Miri] Use a session variable instead of checking for an env var always

In CTFE heavy code, checking the env var everytime is inefficient. We
can do a lot better by using a `Session` variable instead.

r? @RalfJung

Part of rust-lang#69297
librustc_codegen_llvm: Use slices instead of 0-terminated strings

Changed functions:
* LLVMRustGetOrInsertFunction
* LLVMRustGetNamedValue
* LLVMRustBuildCall (removed unused name argument)
* LLVMRustInlineAsm
* LLVMRustInlineAsmVerify
* LLVMRustAppendModuleInlineAsm
@Centril
Copy link
Contributor Author

Centril commented Mar 11, 2020

@bors r+ p=8 rollup=never

@bors
Copy link
Collaborator

bors commented Mar 11, 2020

📌 Commit a77206f 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 Mar 11, 2020
@Centril Centril added the rollup A PR which is a rollup label Mar 11, 2020
@bors
Copy link
Collaborator

bors commented Mar 11, 2020

⌛ Testing commit a77206f with merge c20d7ee...

@bors
Copy link
Collaborator

bors commented Mar 11, 2020

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 11, 2020
@bors bors merged commit c20d7ee into rust-lang:master Mar 11, 2020
@bors bors mentioned this pull request Mar 11, 2020
@rust-highfive
Copy link
Contributor

📣 Toolstate changed by #69919!

Tested on commit c20d7ee.
Direct link to PR: #69919

💔 miri on windows: test-fail → build-fail (cc @oli-obk @eddyb @RalfJung).
💔 miri on linux: test-fail → build-fail (cc @oli-obk @eddyb @RalfJung).

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Mar 11, 2020
Tested on commit rust-lang/rust@c20d7ee.
Direct link to PR: <rust-lang/rust#69919>

💔 miri on windows: test-fail → build-fail (cc @oli-obk @eddyb @RalfJung).
💔 miri on linux: test-fail → build-fail (cc @oli-obk @eddyb @RalfJung).
This was referenced Mar 11, 2020
@Centril Centril deleted the rollup-fxo33zs branch March 23, 2020 23:06
# 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.

8 participants