Skip to content

Use ocx.normalize in report_projection_error#104903

Merged
bors merged 2 commits intorust-lang:masterfrom
spastorino:consolidate-normalize-in-report_projection_error
Dec 3, 2022
Merged

Use ocx.normalize in report_projection_error#104903
bors merged 2 commits intorust-lang:masterfrom
spastorino:consolidate-normalize-in-report_projection_error

Conversation

@spastorino
Copy link
Member

@spastorino spastorino commented Nov 25, 2022

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Nov 25, 2022
@bors
Copy link
Collaborator

bors commented Nov 25, 2022

☔ The latest upstream changes (presumably #104846) made this pull request unmergeable. Please resolve the merge conflicts.

@spastorino spastorino force-pushed the consolidate-normalize-in-report_projection_error branch from f792889 to 7b7a818 Compare November 25, 2022 20:08
lcnr
lcnr reviewed Nov 29, 2022
View reviewed changes
@spastorino
Copy link
Member Author

spastorino commented Nov 29, 2022

Blocked on #104905 landing

@rustbot label +S-blocked

@rustbot rustbot added the S-blocked Status: Blocked on something else such as an RFC or other implementation work. label Nov 29, 2022
@bors
Copy link
Collaborator

bors commented Nov 30, 2022

☔ The latest upstream changes (presumably #104905) made this pull request unmergeable. Please resolve the merge conflicts.

@spastorino spastorino force-pushed the consolidate-normalize-in-report_projection_error branch from 7b7a818 to 58b6b76 Compare November 30, 2022 15:59
@rustbot
Copy link
Collaborator

rustbot commented Nov 30, 2022

Some changes occurred in engine.rs, potentially modifying the public API of ObligationCtxt.

cc @lcnr

@spastorino
Copy link
Member Author

spastorino commented Nov 30, 2022

@rustbot label -S-blocked

@rustbot rustbot removed the S-blocked Status: Blocked on something else such as an RFC or other implementation work. label Nov 30, 2022
@spastorino spastorino force-pushed the consolidate-normalize-in-report_projection_error branch from 58b6b76 to 5e131d2 Compare November 30, 2022 17:27
@spastorino
Copy link
Member Author

spastorino commented Nov 30, 2022

@lcnr this is ready for review

@spastorino spastorino force-pushed the consolidate-normalize-in-report_projection_error branch from 5e131d2 to 190e7bd Compare December 1, 2022 21:02
@lcnr
Copy link
Contributor

lcnr commented Dec 2, 2022

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Dec 2, 2022

📌 Commit 190e7bd has been approved by lcnr

It is now in the queue for this repository.

@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 Dec 2, 2022
@matthiaskrgr matthiaskrgr mentioned this pull request Dec 2, 2022
Closed
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Dec 2, 2022
@matthiaskrgr
Rollup merge of rust-lang#104903 - spastorino:consolidate-normalize-i…
2846d6f 
…n-report_projection_error, r=lcnr

Use ocx.normalize in report_projection_error

r? `@lcnr`

cc `@compiler-errors`
@matthiaskrgr
Copy link
Member

matthiaskrgr commented Dec 2, 2022

@bors r- failed in a rollup

 Documenting rustc_trait_selection v0.0.0 (/checkout/compiler/rustc_trait_selection)
[RUSTC-TIMING] rustc_resolve test:false 4.965
error: unresolved link to `At::trace_exp`
   --> compiler/rustc_trait_selection/src/traits/engine.rs:117:15
    |
117 |     /// See [`At::trace_exp`] and [`Trace::eq`] for a version of
    |               ^^^^^^^^^^^^^ no item named `At` in scope
    |
    = note: `-D rustdoc::broken-intra-doc-links` implied by `-D warnings`

error: unresolved link to `Trace::eq`
   --> compiler/rustc_trait_selection/src/traits/engine.rs:117:37
    |
117 |     /// See [`At::trace_exp`] and [`Trace::eq`] for a version of
    |                                     ^^^^^^^^^ no item named `Trace` in scope

[RUSTC-TIMING] rustc_query_impl test:false 11.659
error: could not document `rustc_trait_selection`

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Dec 2, 2022
@spastorino spastorino force-pushed the consolidate-normalize-in-report_projection_error branch from 190e7bd to 8904743 Compare December 2, 2022 20:31
@spastorino
Copy link
Member Author

spastorino commented Dec 2, 2022

@bors r=lcnr rollup

@bors
Copy link
Collaborator

bors commented Dec 2, 2022

📌 Commit 8904743 has been approved by lcnr

It is now in the queue for this repository.

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Dec 2, 2022
@JohnTitor JohnTitor mentioned this pull request Dec 3, 2022
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 3, 2022
@bors
Auto merge of rust-lang#105196 - JohnTitor:rollup-8rxqnq6, r=JohnTitor
24f2704 
Rollup of 7 pull requests

Successful merges:

 - rust-lang#104903 (Use ocx.normalize in report_projection_error)
 - rust-lang#105032 (improve doc of into_boxed_slice and impl From<Vec<T>> for Box<[T]>)
 - rust-lang#105100 (Add missing intra-doc link)
 - rust-lang#105181 (Don't add a note for implementing a trait if its inner type is erroneous)
 - rust-lang#105182 (Rustdoc-Json: Don't inline foreign traits)
 - rust-lang#105188 (Don't elide type information when printing E0308 with `-Zverbose`)
 - rust-lang#105189 (rustdoc: clean up redundant CSS on `.rustdoc-toggle.hideme`)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 52e8862 into rust-lang:master Dec 3, 2022
@rustbot rustbot added this to the 1.67.0 milestone Dec 3, 2022
@jruderman jruderman mentioned this pull request Dec 12, 2022
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@lcnr lcnr lcnr left review comments

+1 more reviewer

@compiler-errors compiler-errors compiler-errors left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

@lcnr lcnr

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

Milestone

1.67.0

Development

Successfully merging this pull request may close these issues.

6 participants

@spastorino @bors @rustbot @lcnr @matthiaskrgr @compiler-errors