Skip to content

Fix #71363's test by adding -Z translate-remapped-path-to-local-path=no #97789

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 1 commit into from
Jun 11, 2022

Conversation

pietroalbini
Copy link
Member

The test relies on library/std/src/error.rs not corresponding to a local path, but remapping might still find the related local file of a remapped path. To fix the test, this PR adds a new -Z flag to disable finding the corresponding local path of a remapped path.

…al-path=no`

The test relies on library/std/src/error.rs not corresponding to a local
path, but remapping might still find the related local file of a
remapped path. To fix the test, this adds a new -Z flag to disable
finding the corresponding local path of a remapped path.
@rustbot rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Jun 6, 2022
@rust-highfive
Copy link
Contributor

r? @cjgillot

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 6, 2022
@pietroalbini
Copy link
Member Author

Checked locally, and the test should work on all builders.

For more context, see #97682 (issue that led to this discovery), #97786 (PR fixing -Z simulate-remapped-rust-src-base to be consistent across builders) and #97750 (comment) (more discussions on how to fix this test).

@cjgillot
Copy link
Contributor

@bors r+

@bors
Copy link
Collaborator

bors commented Jun 11, 2022

📌 Commit 410e283 has been approved by cjgillot

@bors bors 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 Jun 11, 2022
Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request Jun 11, 2022
…r=cjgillot

Fix rust-lang#71363's test by adding `-Z translate-remapped-path-to-local-path=no`

The test relies on `library/std/src/error.rs` not corresponding to a local path, but remapping might still find the related local file of a remapped path. To fix the test, this PR adds a new `-Z` flag to disable finding the corresponding local path of a remapped path.
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 11, 2022
Rollup of 5 pull requests

Successful merges:

 - rust-lang#97761 (validating the vtable can lead to Stacked Borrows errors)
 - rust-lang#97789 (Fix rust-lang#71363's test by adding `-Z translate-remapped-path-to-local-path=no`)
 - rust-lang#97913 (Wrap `HirId`s of locals into `LocalVarId`s for THIR nodes)
 - rust-lang#97979 (Fix typos in Provider API docs)
 - rust-lang#97987 (remove an unnecessary `String`)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit b7b5045 into rust-lang:master Jun 11, 2022
@rustbot rustbot added this to the 1.63.0 milestone Jun 11, 2022
@pietroalbini pietroalbini deleted the pa-fix-issue-71363-test branch June 13, 2022 13:28
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant 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.

5 participants