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

tidy: Remove submodules from edition exception list #90143

Merged
merged 1 commit into from
Oct 25, 2021
Merged

tidy: Remove submodules from edition exception list #90143

merged 1 commit into from
Oct 25, 2021

Conversation

camelid
Copy link
Member

@camelid camelid commented Oct 21, 2021 •
edited
Loading

Both style-check and date-check are now on the 2021 edition, and this
PR also updates their repositories' submodules.

cc rust-lang/rustc-dev-guide#1238
cc rust-lang/reference#1099
cc #89103 (comment)

@camelid camelid added A-edition-2021 Area: The 2021 edition T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. labels Oct 21, 2021
@rust-highfive
Copy link
Collaborator

r? @Mark-Simulacrum

(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 Oct 21, 2021
@camelid camelid added S-blocked Status: Marked as blocked ❌ on something else such as an RFC or other implementation work. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Oct 21, 2021
@camelid camelid marked this pull request as draft October 21, 2021 20:01
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@camelid camelid marked this pull request as ready for review October 21, 2021 20:32
@camelid
Copy link
Member Author

camelid commented Oct 21, 2021 •
edited
Loading

I added a commit with the submodule update so this PR will be mergeable. Let me know if it's okay to update the submodule here.

@camelid
Copy link
Member Author

camelid commented Oct 21, 2021 •
edited
Loading

I just opened a PR to the reference to switch style-check to Rust 2021: rust-lang/reference#1099. I'm happy to have this PR wait until that one is merged and we can do a submodule bump if you would prefer to do it all at once.

@camelid camelid added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-blocked Status: Marked as blocked ❌ on something else such as an RFC or other implementation work. labels Oct 21, 2021
@camelid
Copy link
Member Author

camelid commented Oct 22, 2021

I just opened a PR to the reference to switch style-check to Rust 2021: rust-lang/reference#1099. I'm happy to have this PR wait until that one is merged and we can do a submodule bump if you would prefer to do it all at once.

Okay, the reference PR has been merged now.

@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 Oct 22, 2021
@camelid camelid changed the title Remove rustc-dev-guide from tidy edition exception list tidy: Remove submodules from editiion exception list Oct 24, 2021
@camelid camelid changed the title tidy: Remove submodules from editiion exception list tidy: Remove submodules from edition exception list Oct 24, 2021
@camelid camelid added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Oct 24, 2021
@camelid
Copy link
Member Author

camelid commented Oct 24, 2021

cc @ehuss -- this PR updates some of the books

@Mark-Simulacrum
Copy link
Member

Can you squash the commits here? I don't think there's any reason to separate out the submodule bumps.

@camelid
Copy link
Member Author

camelid commented Oct 24, 2021

Can you squash the commits here? I don't think there's any reason to separate out the submodule bumps.

Sure, do you want me to squash the submodule commits together, or all of the commits in this PR?

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@Mark-Simulacrum
Copy link
Member

All of them.

@camelid
tidy: Remove submodules from edition exception list
f410bc7 
Both style-check and date-check are now on the 2021 edition, and this
commit also updates their repositories' submodules.
@Mark-Simulacrum
Copy link
Member

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Oct 24, 2021

📌 Commit f410bc7 has been approved by Mark-Simulacrum

@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 Oct 24, 2021
@matthiaskrgr matthiaskrgr mentioned this pull request Oct 25, 2021
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 25, 2021
@bors
Auto merge of rust-lang#90249 - matthiaskrgr:rollup-xwtfhq3, r=matthi…
32f3887 
…askrgr

Rollup of 4 pull requests

Successful merges:

 - rust-lang#89889 (Use the "nice E0277 errors"[1] for `!Send` `impl Future` from foreign crate)
 - rust-lang#90127 (Do not mention a reexported item if it's private)
 - rust-lang#90143 (tidy: Remove submodules from edition exception list)
 - rust-lang#90238 (Add alias for guillaume.gomez@huawei.com)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 9158224 into rust-lang:master Oct 25, 2021
@rustbot rustbot added this to the 1.58.0 milestone Oct 25, 2021
@camelid camelid deleted the tidy-2021-followup branch October 25, 2021 19:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@Mark-Simulacrum Mark-Simulacrum

Labels
A-edition-2021 Area: The 2021 edition S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.58.0
Development

Successfully merging this pull request may close these issues.
6 participants
@camelid @rust-highfive @rust-log-analyzer @Mark-Simulacrum @bors @rustbot