Metadata macro/query cleanups#156131

Merged

rust-bors[bot] merged 2 commits intorust-lang:mainfrom

nnethercote:rm-unnecessary-decode

May 7, 2026

Contributor

nnethercote commented May 4, 2026

Details in individual commits.

nnethercote added 2 commits

May 4, 2026 14:29


          Some arena macro tweaks.

0d0aaa1

- Improve a comment.
- Remove unused `[decode]` annotations on some arenas.
- Improve `impl_arena_allocatable_decoder`:
  - Make the first rule more like the second rule.
  - Remove unnecessary brackets.
  - Remove unused support for attributes other than `decode`.


          Fix a metadata table name.

cdefdd0

The table names usually match the name of the corresponding query.
The `trait_impl_trait_tys` table is an exception; this commit renames it
`collect_return_position_impl_trait_in_trait_tys` to match the query.

rustbot assigned Zalathar

rustbot added S-waiting-on-review T-compiler labels

Collaborator

rustbot commented May 4, 2026

Zalathar is not on the review rotation at the moment.
They may take a while to respond.

Member

Zalathar commented May 6, 2026

Looks good.

I have mixed feelings about the second commit, because collect_return_position_impl_trait_in_trait_tys is kind of a weird table name, but matching the closely-linked query does seem good. And it would be easy enough to rename both the table and the query later, if a better name is found.

@bors r+ rollup

Contributor

rust-bors Bot commented May 6, 2026

📌 Commit cdefdd0 has been approved by Zalathar

It is now in the queue for this repository.

rust-bors Bot added S-waiting-on-bors and removed S-waiting-on-review labels

JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request


          Rollup merge of rust-lang#156131 - nnethercote:rm-unnecessary-decode,…

d2a81cd

… r=Zalathar

Metadata macro/query cleanups

Details in individual commits.

r? @Zalathar

JonathanBrouwer mentioned this pull request

Rollup of 8 pull requests #156232

Closed

JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request


          Rollup merge of rust-lang#156131 - nnethercote:rm-unnecessary-decode,…

11e4da1

… r=Zalathar

Metadata macro/query cleanups

Details in individual commits.

r? @Zalathar

JonathanBrouwer mentioned this pull request

Rollup of 7 pull requests #156233

Closed

JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request


          Rollup merge of rust-lang#156131 - nnethercote:rm-unnecessary-decode,…

ca6f18a

… r=Zalathar

Metadata macro/query cleanups

Details in individual commits.

r? @Zalathar

JonathanBrouwer mentioned this pull request

Rollup of 7 pull requests #156238

Closed

rust-bors Bot pushed a commit that referenced this pull request


          Auto merge of #156238 - JonathanBrouwer:rollup-VXvD19K, r=JonathanBro…

3fcb893

…uwer

Rollup of 7 pull requests

Successful merges:

 - #146273 (lint ImproperCTypes: refactor linting architecture (part 2))
 - #156173 (Fewer global node_id_to_def_id lookups)
 - #155961 (Deny warnings in the test for crates that are available on stable)
 - #156130 (Fold/visit tweaks)
 - #156131 (Metadata macro/query cleanups)
 - #156141 (Resolve some cases of #132279 by using the right typing mode in the next solver)
 - #156202 (llvm: Use correct type for splat mask)

JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request


          Rollup merge of rust-lang#156131 - nnethercote:rm-unnecessary-decode,…

774076f

… r=Zalathar

Metadata macro/query cleanups

Details in individual commits.

r? @Zalathar

JonathanBrouwer mentioned this pull request

Rollup of 7 pull requests #156249

Closed

rust-bors Bot pushed a commit that referenced this pull request


          Auto merge of #156249 - JonathanBrouwer:rollup-P8ylpAs, r=JonathanBro…

6eb3f5b

…uwer

Rollup of 7 pull requests

Successful merges:

 - #146273 (lint ImproperCTypes: refactor linting architecture (part 2))
 - #149509 (Lint unused pub items in binary crates)
 - #156173 (Fewer global node_id_to_def_id lookups)
 - #155961 (Deny warnings in the test for crates that are available on stable)
 - #156130 (Fold/visit tweaks)
 - #156131 (Metadata macro/query cleanups)
 - #156202 (llvm: Use correct type for splat mask)

Failed merges:

 - #156236 (resolve: Remove `MacroData`)

JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request


          Rollup merge of rust-lang#156131 - nnethercote:rm-unnecessary-decode,…

8ad1708

… r=Zalathar

Metadata macro/query cleanups

Details in individual commits.

r? @Zalathar

JonathanBrouwer mentioned this pull request

Rollup of 9 pull requests #156254

Closed

rust-bors Bot pushed a commit that referenced this pull request


          Auto merge of #156254 - JonathanBrouwer:rollup-u4Djp8E, r=JonathanBro…

f2b044e

…uwer

Rollup of 9 pull requests

Successful merges:

 - #156061 (Support `-Cpanic=unwind` on WASI targets)
 - #146273 (lint ImproperCTypes: refactor linting architecture (part 2))
 - #149509 (Lint unused pub items in binary crates)
 - #156173 (Fewer global node_id_to_def_id lookups)
 - #155961 (Deny warnings in the test for crates that are available on stable)
 - #155981 (Use special DefIds for aliases)
 - #156130 (Fold/visit tweaks)
 - #156131 (Metadata macro/query cleanups)
 - #156202 (llvm: Use correct type for splat mask)

Failed merges:

 - #156236 (resolve: Remove `MacroData`)

jhpratt added a commit to jhpratt/rust that referenced this pull request


          Rollup merge of rust-lang#156131 - nnethercote:rm-unnecessary-decode,…

7be86ee

… r=Zalathar

Metadata macro/query cleanups

Details in individual commits.

r? @Zalathar

jhpratt mentioned this pull request

Rollup of 11 pull requests #156261

Closed

jhpratt added a commit to jhpratt/rust that referenced this pull request


          Rollup merge of rust-lang#156131 - nnethercote:rm-unnecessary-decode,…

966d962

… r=Zalathar

Metadata macro/query cleanups

Details in individual commits.

r? @Zalathar

jhpratt mentioned this pull request

Rollup of 11 pull requests #156262

Closed

jhpratt added a commit to jhpratt/rust that referenced this pull request


          Rollup merge of rust-lang#156131 - nnethercote:rm-unnecessary-decode,…

0df7a79

… r=Zalathar

Metadata macro/query cleanups

Details in individual commits.

r? @Zalathar

jhpratt mentioned this pull request

Rollup of 14 pull requests #156263

Closed

rust-bors Bot pushed a commit that referenced this pull request


          Auto merge of #156263 - jhpratt:rollup-aEyNvml, r=jhpratt

620725b

Rollup of 14 pull requests

Successful merges:

 - #146273 (lint ImproperCTypes: refactor linting architecture (part 2))
 - #149509 (Lint unused pub items in binary crates)
 - #156173 (Fewer global node_id_to_def_id lookups)
 - #156177 (windows/time: avoid being too close to 0)
 - #155961 (Deny warnings in the test for crates that are available on stable)
 - #155981 (Use special DefIds for aliases)
 - #156109 (Migrate libraries from ptr::slice_from_raw_parts to .cast_slice)
 - #156130 (Fold/visit tweaks)
 - #156131 (Metadata macro/query cleanups)
 - #156202 (llvm: Use correct type for splat mask)
 - #156227 (Add Trusty OS to the generic error implementation.)
 - #156237 (compiletest: prevent directives from having multiple revisions)
 - #156241 (Move tests coercion)
 - #156258 (Document wasi-sdk minimum versions for WASI targets)

jhpratt mentioned this pull request

Rollup of 12 pull requests #156267

Merged

rust-bors Bot pushed a commit that referenced this pull request


          Auto merge of #156267 - jhpratt:rollup-xaL6466, r=jhpratt

c2705f8

Rollup of 12 pull requests

Successful merges:

 - #156173 (Fewer global node_id_to_def_id lookups)
 - #156177 (windows/time: avoid being too close to 0)
 - #155961 (Deny warnings in the test for crates that are available on stable)
 - #155981 (Use special DefIds for aliases)
 - #156130 (Fold/visit tweaks)
 - #156131 (Metadata macro/query cleanups)
 - #156202 (llvm: Use correct type for splat mask)
 - #156223 (Refactor `Type::size` field to `TypeId::size` method for `type_info`)
 - #156227 (Add Trusty OS to the generic error implementation.)
 - #156237 (compiletest: prevent directives from having multiple revisions)
 - #156241 (Move tests coercion)
 - #156258 (Document wasi-sdk minimum versions for WASI targets)

rust-bors Bot pushed a commit that referenced this pull request


          Auto merge of #156267 - jhpratt:rollup-xaL6466, r=jhpratt

32bd660

Rollup of 12 pull requests

Successful merges:

 - #156173 (Fewer global node_id_to_def_id lookups)
 - #156177 (windows/time: avoid being too close to 0)
 - #155961 (Deny warnings in the test for crates that are available on stable)
 - #155981 (Use special DefIds for aliases)
 - #156130 (Fold/visit tweaks)
 - #156131 (Metadata macro/query cleanups)
 - #156202 (llvm: Use correct type for splat mask)
 - #156223 (Refactor `Type::size` field to `TypeId::size` method for `type_info`)
 - #156227 (Add Trusty OS to the generic error implementation.)
 - #156237 (compiletest: prevent directives from having multiple revisions)
 - #156241 (Move tests coercion)
 - #156258 (Document wasi-sdk minimum versions for WASI targets)

rust-bors Bot merged commit 2aadc4a into rust-lang:main

11 checks passed

rustbot added this to the 1.97.0 milestone

rust-timer added a commit that referenced this pull request


          Unrolled build for #156131

d3f047a

Rollup merge of #156131 - nnethercote:rm-unnecessary-decode, r=Zalathar

Metadata macro/query cleanups

Details in individual commits.

r? @Zalathar

nnethercote deleted the rm-unnecessary-decode branch

May 8, 2026 04:36

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-bors T-compiler