Skip to content

Ensure source file present when calculating max line number - #97504

Merged
bors merged 1 commit into
rust-lang:masterfrom
JohnTitor:cleanup-deps
May 30, 2022
Merged

Ensure source file present when calculating max line number#97504
bors merged 1 commit into
rust-lang:masterfrom
JohnTitor:cleanup-deps

Conversation

@JohnTitor

Copy link
Copy Markdown
Member

Resubmission of #89268, fixes#71363
The behavior difference of simulate-remapped-rust-src-base is not something we should take into account here, so limiting targets to run the test makes sense, I think.

r? @davidtwco, and @estebank, you might be interested in this change

Co-authored-by: Ross MacArthur <ross@macarthur.io>
@rustbotrustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label May 29, 2022
@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 29, 2022
@davidtwco

Copy link
Copy Markdown
Member

@bors r+ rollup

@bors

bors commented May 30, 2022

Copy link
Copy Markdown
Collaborator

📌 Commit 5a4e936 has been approved by davidtwco

@borsbors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels May 30, 2022
@Dylan-DPCDylan-DPC mentioned this pull request May 30, 2022
bors added a commit to rust-lang-ci/rust that referenced this pull request May 30, 2022
Rollup of 6 pull requests
Successful merges:
- rust-lang#97494 (Use Box::new() instead of box syntax in library tests)
- rust-lang#97499 (Remove "sys isn't exported yet" phrase)
- rust-lang#97504 (Ensure source file present when calculating max line number)
- rust-lang#97519 (Re-add help_on_error for download-ci-llvm)
- rust-lang#97531 (Note pattern mismatch coming from `for` loop desugaring)
- rust-lang#97545 (Reword safety comments in core/hash/sip.rs)
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors merged commit 106d5fd into rust-lang:masterMay 30, 2022
@rustbotrustbot added this to the 1.63.0 milestone May 30, 2022
@JohnTitor
JohnTitor deleted the cleanup-deps branch May 30, 2022 23:07
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Regression in spacing of left margin in diagnostics

5 participants

@JohnTitor@davidtwco@bors@rust-highfive@rustbot