Rollup of 7 pull requests #95551

matthiaskrgr · 2022-04-01T04:57:52Z

Successful merges:

rustdoc: Only show associated consts from inherent impls in sidebar #95475 (rustdoc: Only show associated consts from inherent impls in sidebar)
ptr_metadata test: avoid ptr-to-int transmutes #95516 (ptr_metadata test: avoid ptr-to-int transmutes)
skip slow int_log tests in Miri #95528 (skip slow int_log tests in Miri)
expand: Do not count metavar declarations on RHS of macro_rules #95531 (expand: Do not count metavar declarations on RHS of macro_rules)
make utf8_char_counts test faster in Miri #95532 (make utf8_char_counts test faster in Miri)
Improve TyCtxt::type_of documentation #95537 (Improve TyCtxt::type_of documentation)
add notes about alignment-altering reallocations to Allocator docs #95546 (add notes about alignment-altering reallocations to Allocator docs)

Failed merges:

r? @ghost
@rustbot modify labels: rollup

They are 0 by definition there.

…consts-from-trait-impls, r=jsha rustdoc: Only show associated consts from inherent impls in sidebar Resolves rust-lang#95459

ptr_metadata test: avoid ptr-to-int transmutes Pointers can have provenance, integers don't, so transmuting pointers to integers creates "non-standard" values and it is unclear how well those can be supported (rust-lang/unsafe-code-guidelines#286). So for this test let's take the safer option and use a pointer type instead. That also makes Miri happy. :)

skip slow int_log tests in Miri Iterating over i16::MAX many things takes a long time in Miri, let's not do that. I added rust-lang/miri#2044 on the Miri side to still give us some test coverage.

expand: Do not count metavar declarations on RHS of `macro_rules` They are 0 by definition there. Addresses rust-lang#95425 (comment) r? ``@nnethercote``

make utf8_char_counts test faster in Miri This currently takes >3min on GHA, so let's reduce the test size a bit more for Miri.

…-DPC Improve TyCtxt::type_of documentation r? `@oli-obk`

…n-docs, r=Amanieu add notes about alignment-altering reallocations to Allocator docs As I said in rust-lang/wg-allocators#97, the fact that calls to `grow`, `grow_zeroed`, and `shrink` may request altered alignments is surprising and may be a pitfall for implementors of `Allocator` if it's left implicit. This pull request adds a note to the "Safety" section of each function's docs making it explicit.

matthiaskrgr · 2022-04-01T04:58:09Z

@bors r+ rollup=never p=7

bors · 2022-04-01T04:58:10Z

📌 Commit 2c6c5af has been approved by matthiaskrgr

bors · 2022-04-01T04:59:02Z

⌛ Testing commit 2c6c5af with merge 4dfbfbaf2b5b2c5a85192715f52b2c3515de9c21...

bors · 2022-04-01T05:38:24Z

💔 Test failed - checks-actions

rust-log-analyzer · 2022-04-01T05:40:06Z

The job x86_64-gnu-stable failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

 Documenting rustc_codegen_ssa v0.0.0 (/checkout/compiler/rustc_codegen_ssa)
error: unresolved link to `Ty`
   --> compiler/rustc_query_impl/src/plumbing.rs:268:45
    |
268 |             $(#[allow(nonstandard_style)] $(#[$attr])*
    |
   ::: compiler/rustc_query_impl/src/lib.rs:55:1
    |
    |
55  | rustc_query_append! { [define_queries!][<'tcx>] }
    |
    |
    = note: `-D rustdoc::broken-intra-doc-links` implied by `-D warnings`
    = note: the link appears in this line:
            
            Returns the [`Ty`] of the given [`DefId`]. If the [`DefId`] points to an alias, it will
    = note: no item named `Ty` in scope
    = note: no item named `Ty` in scope
    = help: to escape `[` and `]` characters, add '\' before them like `\[` or `\]`
    = note: this error originates in the macro `define_queries` (in Nightly builds, run with -Z macro-backtrace for more info)
error: unresolved link to `DefId`
   --> compiler/rustc_query_impl/src/plumbing.rs:268:45
    |
    |
268 |             $(#[allow(nonstandard_style)] $(#[$attr])*
    |
   ::: compiler/rustc_query_impl/src/lib.rs:55:1
    |
    |
55  | rustc_query_append! { [define_queries!][<'tcx>] }
    |
    = note: the link appears in this line:
            
            
            Returns the [`Ty`] of the given [`DefId`]. If the [`DefId`] points to an alias, it will
    = note: no item named `DefId` in scope
    = note: no item named `DefId` in scope
    = help: to escape `[` and `]` characters, add '\' before them like `\[` or `\]`
    = note: this error originates in the macro `define_queries` (in Nightly builds, run with -Z macro-backtrace for more info)
error: unresolved link to `Ty`
   --> compiler/rustc_query_impl/src/plumbing.rs:485:17
    |
    |
485 |             $($(#[$attr])*  $name: QueryState<query_keys::$name<$tcx>>,)*
    |
   ::: compiler/rustc_query_impl/src/lib.rs:55:1
    |
    |
55  | rustc_query_append! { [define_queries!][<'tcx>] }
    |
    = note: the link appears in this line:
            
            
            Returns the [`Ty`] of the given [`DefId`]. If the [`DefId`] points to an alias, it will
    = note: no item named `Ty` in scope
    = note: no item named `Ty` in scope
    = help: to escape `[` and `]` characters, add '\' before them like `\[` or `\]`
    = note: this error originates in the macro `define_queries_struct` (in Nightly builds, run with -Z macro-backtrace for more info)
error: unresolved link to `DefId`
   --> compiler/rustc_query_impl/src/plumbing.rs:485:17
    |
    |
485 |             $($(#[$attr])*  $name: QueryState<query_keys::$name<$tcx>>,)*
    |
   ::: compiler/rustc_query_impl/src/lib.rs:55:1
    |
    |
55  | rustc_query_append! { [define_queries!][<'tcx>] }
    |
    = note: the link appears in this line:
            
            
            Returns the [`Ty`] of the given [`DefId`]. If the [`DefId`] points to an alias, it will
    = note: no item named `DefId` in scope
    = note: no item named `DefId` in scope
    = help: to escape `[` and `]` characters, add '\' before them like `\[` or `\]`
    = note: this error originates in the macro `define_queries_struct` (in Nightly builds, run with -Z macro-backtrace for more info)
error: unresolved link to `Ty`
   --> compiler/rustc_query_impl/src/plumbing.rs:533:17
    |
    |
533 |             $($(#[$attr])*
    |
   ::: compiler/rustc_query_impl/src/lib.rs:55:1
    |
    |
55  | rustc_query_append! { [define_queries!][<'tcx>] }
    |
    = note: the link appears in this line:
            
            
            Returns the [`Ty`] of the given [`DefId`]. If the [`DefId`] points to an alias, it will
    = note: no item named `Ty` in scope
    = note: no item named `Ty` in scope
    = help: to escape `[` and `]` characters, add '\' before them like `\[` or `\]`
    = note: this error originates in the macro `define_queries_struct` (in Nightly builds, run with -Z macro-backtrace for more info)
error: unresolved link to `DefId`
   --> compiler/rustc_query_impl/src/plumbing.rs:533:17
    |
    |
533 |             $($(#[$attr])*
    |
   ::: compiler/rustc_query_impl/src/lib.rs:55:1
    |
    |
55  | rustc_query_append! { [define_queries!][<'tcx>] }
    |
    = note: the link appears in this line:
            
            
            Returns the [`Ty`] of the given [`DefId`]. If the [`DefId`] points to an alias, it will
    = note: no item named `DefId` in scope
    = note: no item named `DefId` in scope
    = help: to escape `[` and `]` characters, add '\' before them like `\[` or `\]`
    = note: this error originates in the macro `define_queries_struct` (in Nightly builds, run with -Z macro-backtrace for more info)
error: could not document `rustc_query_impl`

Caused by:
Caused by:
  process didn't exit successfully: `/checkout/obj/build/bootstrap/debug/rustdoc --edition=2021 --crate-type lib --crate-name rustc_query_impl compiler/rustc_query_impl/src/lib.rs --target x86_64-unknown-linux-gnu -o /checkout/obj/build/x86_64-unknown-linux-gnu/stage2-rustc/x86_64-unknown-linux-gnu/doc --error-format=json --json=diagnostic-rendered-ansi,artifacts,future-incompat -C metadata=7cc47ce3fefffc96 -L dependency=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-rustc/x86_64-unknown-linux-gnu/release/deps -L dependency=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-rustc/release/deps --extern measureme=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-rustc/x86_64-unknown-linux-gnu/release/deps/libmeasureme-d811de57fd8922da.rmeta --extern rustc_ast=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-rustc/x86_64-unknown-linux-gnu/release/deps/librustc_ast-91e8f3e059a76e36.rmeta --extern rustc_data_structures=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-rustc/x86_64-unknown-linux-gnu/release/deps/librustc_data_structures-a77587f7740aa1e9.rmeta --extern rustc_errors=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-rustc/x86_64-unknown-linux-gnu/release/deps/librustc_errors-80411235d75714ef.rmeta --extern rustc_hir=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-rustc/x86_64-unknown-linux-gnu/release/deps/librustc_hir-d77349e7181a902f.rmeta --extern rustc_index=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-rustc/x86_64-unknown-linux-gnu/release/deps/librustc_index-033285bb1596a93a.rmeta --extern rustc_macros=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-rustc/release/deps/librustc_macros-b21fba65432a8859.so --extern rustc_middle=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-rustc/x86_64-unknown-linux-gnu/release/deps/librustc_middle-8dc8a68eaafa5cc9.rmeta --extern rustc_query_system=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-rustc/x86_64-unknown-linux-gnu/release/deps/librustc_query_system-4c6b8629a2a7fa60.rmeta --extern rustc_serialize=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-rustc/x86_64-unknown-linux-gnu/release/deps/librustc_serialize-497373ff6b2f9c27.rmeta --extern rustc_session=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-rustc/x86_64-unknown-linux-gnu/release/deps/librustc_session-4dfc049b76f713a8.rmeta --extern rustc_span=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-rustc/x86_64-unknown-linux-gnu/release/deps/librustc_span-fc026f39dfffa0a7.rmeta --extern-html-root-url 'measureme=https://docs.rs/measureme/10.0.0/' -Zunstable-options -Csymbol-mangling-version=v0 -Zunstable-options '--check-cfg=names()' '--check-cfg=values()' '--check-cfg=values(bootstrap)' '--check-cfg=values(parallel_compiler)' '--check-cfg=values(no_btreemap_remove_entry)' '--check-cfg=values(crossbeam_loom)' '--check-cfg=values(span_locations)' -Dwarnings '-Wrustdoc::invalid_codeblock_attributes' --crate-version '1.61.0
  (4dfbfbaf2
  2022-04-01)' --document-private-items '-Arustdoc::private-intra-doc-links' --enable-index-page -Zunstable-options -Znormalize-docs --show-type-layout --generate-link-to-definition --extern-html-root-url 'ena=https://docs.rs/ena/latest/'` (exit status: 1)
[RUSTC-TIMING] rustc_infer test:false 6.233
[RUSTC-TIMING] rustc_resolve test:false 4.788
[RUSTC-TIMING] rustc_codegen_ssa test:false 5.192
[RUSTC-TIMING] rustc_query_impl test:false 9.033

Jules-Bertholet and others added 14 commits March 30, 2022 13:49

Only show associated consts from inherent impls in sidebar

c8ab63b

ptr_metadata test: avoid ptr-to-int transmutes

907ba11

skip slow int_log tests in Miri

487bd81

expand: Do not count metavar declarations on RHS of macro_rules

9ab4f73

They are 0 by definition there.

make utf8_char_counts test faster in Miri

85bfe2d

Improve TyCtxt::type_of documentation

dd71ce3

add notes about alignment-altering reallocs to Allocator docs

e246682

Rollup merge of rust-lang#95475 - Jules-Bertholet:rustdoc-hide-assoc-…

7e54402

…consts-from-trait-impls, r=jsha rustdoc: Only show associated consts from inherent impls in sidebar Resolves rust-lang#95459

Rollup merge of rust-lang#95528 - RalfJung:miri-is-too-slow, r=scottmcm

926b5ba

skip slow int_log tests in Miri Iterating over i16::MAX many things takes a long time in Miri, let's not do that. I added rust-lang/miri#2044 on the Miri side to still give us some test coverage.

Rollup merge of rust-lang#95531 - petrochenkov:metacount, r=nnethercote

5d2238f

expand: Do not count metavar declarations on RHS of `macro_rules` They are 0 by definition there. Addresses rust-lang#95425 (comment) r? ``@nnethercote``

Rollup merge of rust-lang#95532 - RalfJung:utf8_char_counts, r=Dylan-DPC

17af0dd

make utf8_char_counts test faster in Miri This currently takes >3min on GHA, so let's reduce the test size a bit more for Miri.

Rollup merge of rust-lang#95537 - GuillaumeGomez:type_of-doc, r=Dylan…

bfbc2e4

…-DPC Improve TyCtxt::type_of documentation r? `@oli-obk`

rustbot added T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Apr 1, 2022

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Apr 1, 2022

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Apr 1, 2022

matthiaskrgr mentioned this pull request Apr 1, 2022

Improve TyCtxt::type_of documentation #95537

Merged

matthiaskrgr closed this Apr 1, 2022

matthiaskrgr deleted the rollup-rp5mkv0 branch July 30, 2022 10:33

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Rollup of 7 pull requests #95551

Rollup of 7 pull requests #95551

Uh oh!

matthiaskrgr commented Apr 1, 2022

Uh oh!

matthiaskrgr commented Apr 1, 2022

Uh oh!

bors commented Apr 1, 2022

Uh oh!

bors commented Apr 1, 2022

Uh oh!

bors commented Apr 1, 2022

Uh oh!

rust-log-analyzer commented Apr 1, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants

Rollup of 7 pull requests #95551

Rollup of 7 pull requests #95551

Uh oh!

Conversation

matthiaskrgr commented Apr 1, 2022

Uh oh!

matthiaskrgr commented Apr 1, 2022

Uh oh!

bors commented Apr 1, 2022

Uh oh!

bors commented Apr 1, 2022

Uh oh!

bors commented Apr 1, 2022

Uh oh!

rust-log-analyzer commented Apr 1, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants