Skip to content

tidy: Remove submodules from edition exception list - #90143

Merged
bors merged 1 commit into
rust-lang:masterfrom
camelid:tidy-2021-followup
Oct 25, 2021
Merged

tidy: Remove submodules from edition exception list#90143
bors merged 1 commit into
rust-lang:masterfrom
camelid:tidy-2021-followup

Conversation

@camelid

@camelidcamelid commented Oct 21, 2021•
edited
Loading

Copy link
Copy Markdown
Member

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)

@camelidcamelid 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

rust-highfive commented Oct 21, 2021

Copy link
Copy Markdown
Contributor

r? @Mark-Simulacrum

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 21, 2021
@camelidcamelid added S-blocked Status: 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

camelid commented Oct 21, 2021•
edited
Loading

Copy link
Copy Markdown
MemberAuthor

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

camelid commented Oct 21, 2021•
edited
Loading

Copy link
Copy Markdown
MemberAuthor

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.

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

camelid commented Oct 22, 2021

Copy link
Copy Markdown
MemberAuthor

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.

@camelidcamelid 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
@camelidcamelid changed the title Remove rustc-dev-guide from tidy edition exception listtidy: Remove submodules from editiion exception listOct 24, 2021
@camelidcamelid changed the title tidy: Remove submodules from editiion exception listtidy: Remove submodules from edition exception listOct 24, 2021
@camelidcamelid 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

camelid commented Oct 24, 2021

Copy link
Copy Markdown
MemberAuthor

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

@Mark-Simulacrum

Mark-Simulacrum commented Oct 24, 2021

Copy link
Copy Markdown
Member

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

@camelid

camelid commented Oct 24, 2021

Copy link
Copy Markdown
MemberAuthor

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

Mark-Simulacrum commented Oct 24, 2021

Copy link
Copy Markdown
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

Mark-Simulacrum commented Oct 24, 2021

Copy link
Copy Markdown
Member

@bors r+ rollup

@bors

bors commented Oct 24, 2021

Copy link
Copy Markdown
Collaborator

📌 Commit f410bc7 has been approved by Mark-Simulacrum

@borsbors 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
@matthiaskrgrmatthiaskrgr 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 ofrust-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:masterOct 25, 2021
@rustbotrustbot 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 freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@Mark-SimulacrumMark-Simulacrum

Labels

A-edition-2021Area: The 2021 editionS-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-infraRelevant 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