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.

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

Group together more size assertions. #102493

Merged

Conversation

nnethercote
Copy link
Contributor

Also add a few more assertions for some relevant token-related types.

And fix an erroneous comment in rustc_errors.

r? @lqd

@rustbot rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Sep 29, 2022
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 29, 2022
@nnethercote
Copy link
Contributor Author

@bors rollup=always

@lqd
Copy link
Member

lqd commented Sep 30, 2022

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Sep 30, 2022

📌 Commit dabb5f07700bd6203d97867ec3ab1f9572fc3ba6 has been approved by lqd

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 Sep 30, 2022
static_assert_size!(LitKind, 2);
static_assert_size!(Token, 24);
static_assert_size!(TokenKind, 16);
static_assert_size!(Nonterminal, 16);
Copy link
Contributor

Choose a reason for hiding this comment

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

The last one is not in alphabetical order :)

@nnethercote
Copy link
Contributor Author

@bors r-

I'll fix the ordering on Monday.

@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 Sep 30, 2022
Also add a few more assertions for some relevant token-related types.

And fix an erroneous comment in `rustc_errors`.
@nnethercote nnethercote force-pushed the improve-size-assertions-some-more branch from dabb5f0 to 5ab68a8 Compare September 30, 2022 21:30
@nnethercote
Copy link
Contributor Author

I fixed the ordering.

@bors r=lqd rollup=always

@bors
Copy link
Contributor

bors commented Sep 30, 2022

📌 Commit 5ab68a8 has been approved by lqd

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 Sep 30, 2022
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 1, 2022
…iaskrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#102361 (Fix ICE in const_trait check code)
 - rust-lang#102373 (Flush delayed bugs before codegen)
 - rust-lang#102483 (create def ids for impl traits during ast lowering)
 - rust-lang#102490 (Generate synthetic region from `impl` even in closure body within an associated fn)
 - rust-lang#102492 (Don't lower assoc bindings just to deny them)
 - rust-lang#102493 (Group together more size assertions.)
 - rust-lang#102521 (rustdoc: add missing margin to no-docblock methods)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit eaf1c7a into rust-lang:master Oct 1, 2022
@rustbot rustbot added this to the 1.66.0 milestone Oct 1, 2022
@nnethercote nnethercote deleted the improve-size-assertions-some-more branch October 2, 2022 23:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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
Development

Successfully merging this pull request may close these issues.

6 participants