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

Rollup of 7 pull requests #105687

Closed
wants to merge 14 commits into from

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

uberFoo and others added 14 commits December 12, 2022 16:22
this is not yet supported:
..X => rust-lang#37854 is still open
* Adjusting log line in `fuchsia-test-runner.py` to refer to self
This is common syntax used for intra-doc links, so fixing it should help
with doc formatting.
* Merge the color-changing block into the regular rules, which was
  probably written that way because it used to be in the theme files,
  but has no reason to be written this way now that it's in rustdoc.css

* Get rid of redundant `display: block`, since `position: absolute`
  blockifies the layout anyway.
Add a test for rust-lang#92481

The test was copied ad-hoc from rust-lang#92481, but I can't get the test to pass, because of needing to get twice the same error on the last line of the source.

Closes rust-lang#92481
Minor grammar nit.

I was browsing the documentation and noticed that this should be an adverb.
Remove ..X from RELEASES.md

this is not yet supported:
..X => rust-lang#37854 is still open
Adjust log line in `fuchsia-test-runner.py`

* Adjusting log line in `fuchsia-test-runner.py` to refer to self

r? `@tmandry`
…illaumeGomez

rustdoc: apply `pre-wrap` CSS to code-wrapped links

This is common syntax used for intra-doc links, so fixing it should help with doc formatting.
…rge, r=GuillaumeGomez

rustdoc: simplify popover CSS

* Merge the color-changing block into the regular rules, which was probably written that way because it used to be in the theme files, but has no reason to be written this way now that it's in rustdoc.css

* Get rid of redundant `display: block`, since `position: absolute` blockifies the layout anyway.
@rustbot rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. T-release Relevant to the release subteam, 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 Dec 14, 2022
@matthiaskrgr
Copy link
Member Author

@bors r+ rolllup=never p=7

@bors
Copy link
Contributor

bors commented Dec 14, 2022

📌 Commit 6866cb7 has been approved by matthiaskrgr

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 Dec 14, 2022
@rust-log-analyzer
Copy link
Collaborator

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

Click to see the possible cause of the failure (guessed by this bot)
---- [ui] src/test/ui/typeck/issue-92481.rs stdout ----
diff of stderr:

32    |
33 LL |         d..||_=m
34    |         ^ field does not exist
+   --> $SRC_DIR/core/src/result.rs:LL:COL
-   ::: $SRC_DIR/core/src/result.rs:LL:COL
-    |
- LL |     Ok(#[stable(feature = "rust1", since = "1.0.0")] T),
- LL |     Ok(#[stable(feature = "rust1", since = "1.0.0")] T),
-    |     -- `Result<_, _>::Ok` defined here
+    = note: `Result<_, _>::Ok` defined here
40    |
41 help: `Result<_, _>::Ok` is a tuple variant, use the appropriate syntax


The actual stderr differed from the expected stderr.
Actual stderr saved to /checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/typeck/issue-92481/issue-92481.stderr
Actual stderr saved to /checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/typeck/issue-92481/issue-92481.stderr
To update references, rerun the tests and pass the `--bless` flag
To only update this specific test, also pass `--test-args typeck/issue-92481.rs`

error: 1 errors occurred comparing output.
status: exit status: 1
command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/ui/typeck/issue-92481.rs" "-Zthreads=1" "--target=x86_64-unknown-linux-gnu" "--error-format" "json" "--json" "future-incompat" "-Ccodegen-units=1" "-Zui-testing" "-Zsimulate-remapped-rust-src-base=/rustc/FAKE_PREFIX" "-Ztranslate-remapped-path-to-local-path=no" "-Zdeduplicate-diagnostics=no" "-Cstrip=debuginfo" "--emit" "metadata" "-C" "prefer-dynamic" "--out-dir" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/typeck/issue-92481" "-A" "unused" "-Crpath" "-Cdebuginfo=0" "-Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/typeck/issue-92481/auxiliary"
stdout: none
--- stderr -------------------------------
error: expected parameter name, found `{`
   |
   |
LL | fn r({) {
   |      ^ expected parameter name

error: expected one of `,`, `:`, or `}`, found `..`
   |
   |
LL | fn r({) {
   |      ^ unclosed delimiter
LL |     Ok {             //~ ERROR mismatched types [E0308]
LL |         d..||_=m
   |          -^
   |          |
   |          help: `}` may belong here
error[E0425]: cannot find value `d` in this scope
  --> /checkout/src/test/ui/typeck/issue-92481.rs:7:9
   |
   |
LL |         d..||_=m
Some tests failed in compiletest suite=ui mode=ui host=x86_64-unknown-linux-gnu target=x86_64-unknown-linux-gnu


error[E0425]: cannot find value `m` in this scope
   |
   |
LL |         d..||_=m


error[E0559]: variant `Result<_, _>::Ok` has no field named `d`
   |
   |
LL |         d..||_=m
   |         ^ field does not exist
  --> /rustc/FAKE_PREFIX/library/core/src/result.rs:508:5
   |
   = note: `Result<_, _>::Ok` defined here
   |
help: `Result<_, _>::Ok` is a tuple variant, use the appropriate syntax
   |
LL |     Result<_, _>::Ok(/* fields */)

error[E0308]: mismatched types
  --> /checkout/src/test/ui/typeck/issue-92481.rs:6:5
   |
   |
LL |   fn r({) {
   |           - help: a return type might be missing here: `-> _`
LL | /     Ok {             //~ ERROR mismatched types [E0308]
LL | |         d..||_=m
LL | |     }
   |
   = note: expected unit type `()`
                   found enum `Result<_, _>`

@matthiaskrgr matthiaskrgr deleted the rollup-5jbyzvg branch December 22, 2022 10:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-testsuite Area: The testsuite used to check the correctness of rustc rollup A PR which is a rollup 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. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. T-release Relevant to the release subteam, 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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants