Skip to content

Rollup of 6 pull requests #60250

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 19 commits into from
Apr 25, 2019
Merged

Rollup of 6 pull requests #60250

merged 19 commits into from
Apr 25, 2019

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Apr 25, 2019

Successful merges:

Failed merges:

r? @ghost

euclio and others added 19 commits April 4, 2019 10:04
Only suggest label names in the same hygiene context, and use a
structured suggestion.
Cast type may be a subtype of the destination type. There is a later
assertion that they have the same layout.
Fixes an ICE for the following code:

fn foo(_ : &()) {}
static X: fn(&'static ()) = foo;
This avoids some unnecessary moves
…p, r=oli-obk

MIR generation cleanup

* Handle the case where the body of a constant is a subtype of the type of the constant (see `mir_static_subtype.rs`).
* Move the evaluation of `ExprKind::Use` into `into.rs`, saving an unnecessary copy.
tweak unresolved label suggestion

Only suggest label names in the same hygiene context, and use a
structured suggestion.

Question for reviewer: Is this the right way to check for label hygiene?
…lexcrichton

Add codegen test for PGO instrumentation.

This PR adds a codegen test that makes sure that LLVM actually generates instrumentation code when we enable PGO instrumentation in `rustc`.

The second commit updates a test case to the new commandline option syntax introduced in rust-lang#59874. Without the fix the test still works, but it confusingly creates a directory called `test.profraw`, which usually is the name of the _file_ where profiling data is collected.
…annotation, r=estebank

Fix rust-lang#58270, fix off-by-one error in error diagnostics.

This fixes rust-lang#58270 by checking if two diagnostics overlap completely when we're calculating the line offset for each message.
… r=rkruppe

Reexport IntErrorKind in std

Currently `IntErrorKind` can only be found in `core`. @Centril confirmed on Discord that this is unintentional (should I r? him in this situation?).

Should there be a test for this? As far as this *specific* situation goes, I don't think so, I'll risk it and say that there's no way this regresses. However, it might be a good idea to have some tool detect public items in `core` that are not reexported in `std`. Does this belong in tidy, or should that be a separate tool? Is there some rustc-specific *linter*? Unless that's entirely a dumb idea, this should probably get an issue.

Note: My local build hasn't finished yet, but it's well past the point where I would expect problems.
@Centril
Copy link
Contributor Author

Centril commented Apr 25, 2019

@bors r+ p=6

@bors
Copy link
Collaborator

bors commented Apr 25, 2019

📌 Commit 1443f3b 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 25, 2019
@bors
Copy link
Collaborator

bors commented Apr 25, 2019

⌛ Testing commit 1443f3b with merge 9aea116...

bors added a commit that referenced this pull request Apr 25, 2019
Rollup of 6 pull requests

Successful merges:

 - #59560 (MIR generation cleanup)
 - #59697 (tweak unresolved label suggestion)
 - #60038 (Add codegen test for PGO instrumentation.)
 - #60160 (Fix #58270, fix off-by-one error in error diagnostics.)
 - #60185 (Reexport IntErrorKind in std)
 - #60243 (Add regression test for #53249.)

Failed merges:

r? @ghost
@bors
Copy link
Collaborator

bors commented Apr 25, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: Centril
Pushing 9aea116 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 25, 2019
@bors bors merged commit 1443f3b into rust-lang:master Apr 25, 2019
@Centril Centril deleted the rollup-d9tehhr branch April 25, 2019 06:34
@Centril Centril added the rollup A PR which is a rollup label Oct 2, 2019
# 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.

Span off-by-one error in diagnostics
8 participants