Skip to content

Conversation

compiler-errors
Copy link
Member

@compiler-errors compiler-errors commented Mar 7, 2022

We were using the trait-ref substs instead of impl substs in rustc_on_unimplemented, even when computing the rustc_on_unimplemented attached to an impl block. Let's not do that.

This PR also untangles impl and trait def-ids in the logic in on_unimplemented a bit.

Fixes #94675

@rustbot rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Mar 7, 2022
@rust-highfive
Copy link
Contributor

r? @petrochenkov

(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 Mar 7, 2022
@compiler-errors compiler-errors force-pushed the on-unimplemented-substs branch from a96d38d to f860cec Compare March 7, 2022 02:41
@compiler-errors compiler-errors force-pushed the on-unimplemented-substs branch from f860cec to e9ddb8f Compare March 7, 2022 02:44
@@ -1,6 +1,7 @@
// test for #87707
// edition:2018
// run-fail
// exec-env:RUST_BACKTRACE=0
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Drive-by so I don't keep accidentally changing the output of issue-87707.run.stderr because my environment has RUST_BACKTRACE=full by default.

@petrochenkov
Copy link
Contributor

@bors r+

@bors
Copy link
Collaborator

bors commented Mar 8, 2022

📌 Commit b726bfb has been approved by petrochenkov

@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 Mar 8, 2022
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 8, 2022
Rollup of 5 pull requests

Successful merges:

 - rust-lang#94689 (Use impl substs in `#[rustc_on_unimplemented]`)
 - rust-lang#94714 (Enable `close_read_wakes_up` test on Windows)
 - rust-lang#94723 (Add core::hint::must_use)
 - rust-lang#94724 (unix: Avoid name conversions in `remove_dir_all_recursive`)
 - rust-lang#94730 (Reverted atomic_mut_ptr feature removal causing compilation break)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 568736b into rust-lang:master Mar 9, 2022
@rustbot rustbot added this to the 1.61.0 milestone Mar 9, 2022
@bors
Copy link
Collaborator

bors commented Mar 9, 2022

⌛ Testing commit b726bfb with merge 803a759...

@compiler-errors compiler-errors deleted the on-unimplemented-substs branch April 7, 2022 04:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in 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.

ICE with const_trait_impl and const_mut_refs and explicit lifetimes
5 participants