Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Recover suggestions and useful information lost in previous PR #91981

Merged
merged 6 commits into from
Mar 27, 2022
Merged

Recover suggestions and useful information lost in previous PR #91981

merged 6 commits into from
Mar 27, 2022

Conversation

estebank
Copy link
Contributor

Follow up to #91898.

@rustbot rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Dec 15, 2021
@rust-highfive
Copy link
Collaborator

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 Dec 15, 2021
@estebank estebank mentioned this pull request Dec 15, 2021
Merged
@cjgillot
Copy link
Contributor

Some of the changes may have an impact on how inference works. @lcnr, could you take a look (since you reviewed #91898)?

@lcnr
Copy link
Contributor

lcnr commented Jan 5, 2022

some nits, then r=me

lcnr
lcnr reviewed Jan 5, 2022
View reviewed changes
compiler/rustc_infer/src/infer/mod.rs Outdated Show resolved Hide resolved
compiler/rustc_typeck/src/astconv/generics.rs Outdated Show resolved Hide resolved
@camelid camelid 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-review Status: Awaiting review from the assignee but also interested parties. labels Jan 25, 2022
@camelid
Copy link
Member

camelid commented Jan 25, 2022

triage: @estebank could you address the review when you get a chance? Thanks!

@JohnCSimon JohnCSimon 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Feb 13, 2022
@JohnCSimon JohnCSimon 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 20, 2022
@estebank
Copy link
Contributor Author

@bors r=lcnr

@bors
Copy link
Contributor

bors commented Mar 27, 2022

📌 Commit f479e26 has been approved by lcnr

@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 Mar 27, 2022
@Dylan-DPC Dylan-DPC mentioned this pull request Mar 27, 2022
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 27, 2022
@bors
Auto merge of rust-lang#95351 - Dylan-DPC:rollup-o1il7tx, r=Dylan-DPC
185a3f0 
Rollup of 5 pull requests

Successful merges:

 - rust-lang#91981 (Recover suggestions and useful information lost in previous PR)
 - rust-lang#93469 (Skip pointing out ambiguous impls in alloc/std crates too in inference errors)
 - rust-lang#95335 (Move resolve_path to rustc_builtin_macros and make it private)
 - rust-lang#95340 (interpret: with enforce_number_validity, ensure integers are truly Scalar::Int (i.e., no pointers))
 - rust-lang#95341 (ARMv6K Horizon OS has_thread_local support)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors
Copy link
Contributor

bors commented Mar 27, 2022

⌛ Testing commit f479e26 with merge 185a3f0...

@bors bors merged commit 4435bb0 into rust-lang:master Mar 27, 2022
@rustbot rustbot added this to the 1.61.0 milestone Mar 27, 2022
@estebank estebank deleted the tweakaroo branch November 9, 2023 05:14
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

Assignees

@cjgillot cjgillot

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.61.0
Development

Successfully merging this pull request may close these issues.
8 participants
@estebank @rust-highfive @cjgillot @lcnr @camelid @bors @JohnCSimon @rustbot