Skip to content

Rollup of 8 pull requests - #96753

Closed
compiler-errors wants to merge 21 commits into
rust-lang:masterfrom
compiler-errors:rollup-jnjyknj
Closed

Rollup of 8 pull requests#96753
compiler-errors wants to merge 21 commits into
rust-lang:masterfrom
compiler-errors:rollup-jnjyknj

Conversation

@compiler-errors

Copy link
Copy Markdown
Contributor

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

Elliot-Robertsand others added 21 commits May 2, 2022 17:40
The constants used in SymFn operands have FnDef type,
so the type of the constant identifies the function.
Co-Authored-By: Guillaume Gomez <guillaume1.gomez@gmail.com>
* If it's just `-> a`, use "In Function Return Types"
* If it's just `a b`, use "In Function Parameters"
* Otherwise, still use "In Function Signatures"
…ime to prevent the style to be applied afterwards on slow connections
Looks like they were in FxHash order before, so it might just be luck that this used to be consistent across different word lengths.
…iler-errors
Begin fixing all the broken doctests in `compiler/`
Begins to fixrust-lang#95994.
All of them pass now but 24 of them I've marked with `ignore HELP (<explanation>)` (asking for help) as I'm unsure how to get them to work / if we should leave them as they are.
There are also a few that I marked `ignore` that could maybe be made to work but seem less important.
Each `ignore` has a rough "reason" for ignoring after it parentheses, with
- `(pseudo-rust)` meaning "mostly rust-like but contains foreign syntax"
- `(illustrative)` a somewhat catchall for either a fragment of rust that doesn't stand on its own (like a lone type), or abbreviated rust with ellipses and undeclared types that would get too cluttered if made compile-worthy.
- `(not-rust)` stuff that isn't rust but benefits from the syntax highlighting, like MIR.
- `(internal)` uses `rustc_*` code which would be difficult to make work with the testing setup.
Those reason notes are a bit inconsistently applied and messy though. If that's important I can go through them again and try a more principled approach. When I run `rg '```ignore \(' .` on the repo, there look to be lots of different conventions other people have used for this sort of thing. I could try unifying them all if that would be helpful.
I'm not sure if there was a better existing way to do this but I wrote my own script to help me run all the doctests and wade through the output. If that would be useful to anyone else, I put it here: https://github.com/Elliot-Roberts/rust_doctest_fixing_tool
…ch, r=GuillaumeGomez,jsha
rustdoc: when running a function-signature search, tweak the tab bar
# Before
![In Names (7) / In Parameters (0) / In Return types (0)](https://user-images.githubusercontent.com/1593513/166122875-ffdeafe6-8d4d-4e61-84a6-f5986b50ac35.png)
# After
![In Function Signature (7)](https://user-images.githubusercontent.com/1593513/166122883-9a3d7515-3235-4ee3-8c4b-5401d109e099.png)
Collect function instance used in `global_asm!` sym operand
The constants used in SymFn operands have FnDef type,
so the type of the constant identifies the function.
Fixesrust-lang#96623.
…r=jsha
Add rotation animation on settings button when loading
As discussed, I added an animation when the settings JS file is loading (I voluntarily made the timeout at the end of the `settings.js` super long so we can see what the animation looks like):
https://user-images.githubusercontent.com/3050060/166693243-816a08b7-5e39-4142-acd3-686ad9950d8e.mp4
r? ```@jsha```
…=compiler-errors
Add a regression test for rust-lang#64173 and rust-lang#66152Closesrust-lang#64173Closesrust-lang#66152
Mixed the code as the root cause seems the same.
…ding-strategy, r=jsha
Improve settings loading strategy
I learned about this thanks to ``@jsha`` who suggested this approach:
It improves the settings loading strategy by loading CSS and JS at the same time to prevent the style to be applied afterwards on slow connections.
r? ``@jsha``
…, r=compiler-errors
Add `track_caller` to `DefId::expect_local()`
Suggested in rust-lang#96738 (comment).
`DefId::expect_local()` often causes ICEs (panics) and should be a good candidate to add `track_caller`.
…errors
Put the incompatible_closure_captures lint messages in alphabetical order
Looks like they were in hash order before, which was causing me trouble in rust-lang#94598, so this PR sorts the errors by trait name.
@rustbotrustbot 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 May 6, 2022
@compiler-errors

Copy link
Copy Markdown
ContributorAuthor

@bors r+ rollup=never p=8

@bors

bors commented May 6, 2022

Copy link
Copy Markdown
Collaborator

📌 Commit 3fd498a has been approved by compiler-errors

@borsbors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label May 6, 2022
@bors

bors commented May 6, 2022

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 3fd498a with merge 1dcee1ff6c57fe954be456e778b6acb659472cb4...

@bors

bors commented May 6, 2022

Copy link
Copy Markdown
Collaborator

💔 Test failed - checks-actions

@borsbors 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 May 6, 2022
@rust-log-analyzer

Copy link
Copy Markdown
Collaborator

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_mir_transform v0.0.0 (/checkout/compiler/rustc_mir_transform)
error: could not parse code block as Rust code
--> compiler/rustc_typeck/src/check/upvar.rs:469:9
|
469 | /// ```ignore (illustrative)
470 | | /// {
471 | | /// Place(base: hir_id_s, projections: [], ....) -> {
472 | | /// capture_kind_expr: hir_id_L5,
... |
... |
490 | | /// },
491 | | /// ```
| |___________^
|
= note: `-D rustdoc::invalid-rust-codeblocks` implied by `-D warnings`
help: `ignore` code blocks require valid Rust code for syntax highlighting; mark blocks that do not contain Rust code as text: ```text
|
|
469 | /// ```ignore (illustrative)
= note: error from rustc: this file contains an unclosed delimiter
error: could not parse code block as Rust code
--> compiler/rustc_typeck/src/check/upvar.rs:494:9
--> compiler/rustc_typeck/src/check/upvar.rs:494:9
|
494 | /// ```ignore (illustrative)
495 | | /// {
496 | | /// hir_id_s -> [
497 | | /// Place(base: hir_id_s, projections: [], ....) -> {
... |
... |
509 | | /// ],
510 | | /// ```
| |___________^
|
help: `ignore` code blocks require valid Rust code for syntax highlighting; mark blocks that do not contain Rust code as text: ```text
|
|
494 | /// ```ignore (illustrative)
= note: error from rustc: this file contains an unclosed delimiter
error: could not document `rustc_typeck`
Caused by:
process didn't exit successfully: `/checkout/obj/build/bootstrap/debug/rustdoc --edition=2021 --crate-type lib --crate-name rustc_typeck compiler/rustc_typeck/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=7df012d1ec9a56b6 -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 rustc_arena=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-rustc/x86_64-unknown-linux-gnu/release/deps/librustc_arena-e82bb75ba8483eff.rmeta --extern rustc_ast=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-rustc/x86_64-unknown-linux-gnu/release/deps/librustc_ast-a750aea9a64f8d61.rmeta --extern rustc_attr=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-rustc/x86_64-unknown-linux-gnu/release/deps/librustc_attr-c8d9e4b482958049.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-103f6423a3bc3437.rmeta --extern rustc_errors=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-rustc/x86_64-unknown-linux-gnu/release/deps/librustc_errors-81cdae45ccf80ffd.rmeta --extern rustc_graphviz=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-rustc/x86_64-unknown-linux-gnu/release/deps/librustc_graphviz-6b3abc053a2abe18.rmeta --extern rustc_hir=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-rustc/x86_64-unknown-linux-gnu/release/deps/librustc_hir-d1bbee5bca50ed10.rmeta --extern rustc_hir_pretty=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-rustc/x86_64-unknown-linux-gnu/release/deps/librustc_hir_pretty-074d71a18991f814.rmeta --extern rustc_index=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-rustc/x86_64-unknown-linux-gnu/release/deps/librustc_index-b49528786b673865.rmeta --extern rustc_infer=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-rustc/x86_64-unknown-linux-gnu/release/deps/librustc_infer-e08336ed824e08db.rmeta --extern rustc_lint=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-rustc/x86_64-unknown-linux-gnu/release/deps/librustc_lint-295abe7f041953ca.rmeta --extern rustc_macros=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-rustc/release/deps/librustc_macros-b1992b4ff432ea9b.so --extern rustc_middle=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-rustc/x86_64-unknown-linux-gnu/release/deps/librustc_middle-806519aec0da67b2.rmeta --extern rustc_serialize=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-rustc/x86_64-unknown-linux-gnu/release/deps/librustc_serialize-16dbc879c9635e7e.rmeta --extern rustc_session=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-rustc/x86_64-unknown-linux-gnu/release/deps/librustc_session-aa42975d8741ff99.rmeta --extern rustc_span=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-rustc/x86_64-unknown-linux-gnu/release/deps/librustc_span-a7cd8697c90b62de.rmeta --extern rustc_target=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-rustc/x86_64-unknown-linux-gnu/release/deps/librustc_target-38e80a6158b44074.rmeta --extern rustc_trait_selection=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-rustc/x86_64-unknown-linux-gnu/release/deps/librustc_trait_selection-e128259e1b429bc7.rmeta --extern rustc_ty_utils=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-rustc/x86_64-unknown-linux-gnu/release/deps/librustc_ty_utils-2dccca5702ec9daa.rmeta --extern smallvec=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-rustc/x86_64-unknown-linux-gnu/release/deps/libsmallvec-0a6a5c5f7e122fce.rmeta --extern tracing=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-rustc/x86_64-unknown-linux-gnu/release/deps/libtracing-6ed30aef0ae887a4.rmeta --extern-html-root-url 'smallvec=https://docs.rs/smallvec/1.7.0/' --extern-html-root-url 'tracing=https://docs.rs/tracing/0.1.29/' -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.62.0
(1dcee1ff6
2022-05-06)' --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_mir_transform test:false 4.235
[RUSTC-TIMING] rustc_borrowck test:false 5.995
[RUSTC-TIMING] rustc_typeck test:false 13.659
Build completed unsuccessfully in 0:32:50

@compiler-errors
compiler-errors deleted the rollup-jnjyknj branch August 11, 2023 20:16
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

rollupA PR which is a rollupS-waiting-on-reviewStatus: Awaiting review from the assignee but also interested parties.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.T-rustdocRelevant to the rustdoc team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

10 participants

@compiler-errors@bors@rust-log-analyzer@rustbot@Elliot-Roberts@tmiasko@GuillaumeGomez@JohnTitor@notriddle@scottmcm