Skip to content
This repository was archived by the owner on Apr 5, 2024. It is now read-only.

Update rustc to 2022-03-13 #288

Merged
merged 12 commits into from
May 7, 2022
Merged

Update rustc to 2022-03-13 #288

merged 12 commits into from
May 7, 2022

Conversation

dario23
Copy link
Contributor

@dario23 dario23 commented May 3, 2022

No description provided.

dario23
dario23 commented May 3, 2022
View reviewed changes
@JohnTitor
Copy link
Member

The build fails, also could you do commits like #281? Otherwise it's hard to review what's changed.

@dario23
Copy link
Contributor Author

dario23 commented May 4, 2022

will do, thanks for the quick response :-)

do you have input about my all_trait_implementations problem? it was removed in 5acd1f9, replaced by trait_impls_in_crate_untracked for rustdoc, but i'm not sure we're using any of the rustc_metadata/CStore stuff in here yet, so that'd be a bigger refactor i fear. on the other hand, we could roll our own visitor to collect all trait impls, at the cost of some duplication with rustc and/or rustdoc, which i'm not sure is the way to go either. any advice much appreciated.

@JohnTitor
Copy link
Member

Yeah, I've also encountered this issue, that's why the current nightly version is nightly-2021-12-31.
As you said, duplicating some logic similar to rustdoc would be a solution, but I'm not familiar enough with that area/changes to advise, unfortunately :(
cc @petrochenkov, do you have any clue on this?

@dario23
Rustup to rust-lang/rust#92086
6ebd336 
For us this mostly means changing `hir::exports::Export` to
`metadata::ModChild` and `tcx.item_children` to `tcx.module_children`.
@dario23 dario23 changed the title Update rustc to 2022-04-15 Update rustc to 2022-03-13 May 4, 2022
@dario23
Copy link
Contributor Author

dario23 commented May 4, 2022

updated/reworked into separate commits, tests still fail since i'm not really handling the missing all_trait_implementations, just making it compile/pass clippy checks.

dario23 added 11 commits May 6, 2022 21:03
@dario23
Rustup to rust-lang/rust#92608
1aff824
@dario23
Rustup to rust-lang/rust#92533
e35c56f
@dario23
Rustup to rust-lang/rust#92805
8e92282 
Needed to adjust stdout for trait_impls, due to new allocator generic
parameter for `Vec` and `Box`, decided it wasn't worth a separate
commit.
@dario23
Rustup to rust-lang/rust#87648
9663612
@dario23
Rustup to rust-lang/rust#93095
e997d62
@dario23
Rustup to rust-lang/rust#88679
02e868f
@dario23
Rustup to rust-lang/rust#93938
73a6075
@dario23
Rustup to rust-lang/rust#93148
310a4ad
@dario23
Rustup to rust-lang/rust#93368
be85c12 
Change the trait_impls stdout file back, the `Display` impls have gotten
changed back in the meantime it seems.
@dario23
Rustup to rust-lang/rust#94733
8ef45e8
@dario23
Update README
644b3e2
@dario23
Copy link
Contributor Author

dario23 commented May 6, 2022 •
edited
Loading

alright, found a pretty painless way to use the rustc_metadata::CStore methods, via CStore::from_tcx, which is essentially a downcast, so not even computationally expensive. marking as ready for review once the CI passes 💪

@dario23 dario23 marked this pull request as ready for review May 6, 2022 19:38
JohnTitor
JohnTitor approved these changes May 7, 2022
View reviewed changes
Copy link
Member

@JohnTitor JohnTitor left a comment

Choose a reason for hiding this comment

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

Looks great, thanks for the detailed commits.

@JohnTitor
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented May 7, 2022

📌 Commit 644b3e2 has been approved by JohnTitor

@bors
Copy link
Contributor

bors commented May 7, 2022

⌛ Testing commit 644b3e2 with merge 324a149...

@bors
Copy link
Contributor

bors commented May 7, 2022

☀️ Test successful - checks-actions
Approved by: JohnTitor
Pushing 324a149 to master...

@bors bors merged commit 324a149 into rust-lang:master May 7, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@JohnTitor JohnTitor JohnTitor approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@dario23 @JohnTitor @bors