Skip to content

Rollup of 4 pull requests #118332

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Closed

Conversation

GuillaumeGomez
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

WaffleLapkin and others added 8 commits November 26, 2023 15:01
before: `for fn (T₁, T₂, …, Tₙ) -> Ret`
after: `for fn(T₁, T₂, …, Tₙ) -> Ret`
As use of `--doc` with `x test` is intended for running doc-tests only, executing
compiletest, tidy or rustdoc-gui based tests considered as an incorrect behavior
from bootstrap. This change fixes that.

Signed-off-by: onur-ozkan <work@onurozkan.dev>
…ke-variadic, r=notriddle

rustdoc: Remove space from fake-variadic fn ptr impls

before: `for fn (T₁, T₂, …, Tₙ) -> Ret`
after: `for fn(T₁, T₂, …, Tₙ) -> Ret`

I don't think we usually have spaces there, so it looks weird.

cc `@notriddle` since you added the space in rust-lang#98180 (or rather, added the feature with a space included).
…ompiletest, r=clubby789

skip {tidy,compiletest,rustdoc-gui} based tests for `DocTests::Only`

As use of `--doc` with `x test` is intended for running doc-tests only, executing compiletest, tidy or rustdoc-gui based tests considered as an incorrect behavior from bootstrap. This change fixes that.
…mease

Fix Rustdoc search docs link

This link has been outdated since rust-lang#112725 moved the search docs to their own page
…k-Simulacrum

Add my work email to the mailmap

(my employer asks me to commit upstreaming under my work email)
@rustbot rustbot added A-meta Area: Issues & PRs about the rust-lang/rust repository itself S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-libs Relevant to the library 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 Nov 26, 2023
@GuillaumeGomez
Copy link
Member Author

@bors r+ rollup=never p=4

@bors
Copy link
Collaborator

bors commented Nov 26, 2023

📌 Commit 5ad57d7 has been approved by GuillaumeGomez

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 Nov 26, 2023
@bors
Copy link
Collaborator

bors commented Nov 26, 2023

⌛ Testing commit 5ad57d7 with merge af0e290...

bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 26, 2023
…llaumeGomez

Rollup of 4 pull requests

Successful merges:

 - rust-lang#118321 (rustdoc: Remove space from fake-variadic fn ptr impls)
 - rust-lang#118322 (skip {tidy,compiletest,rustdoc-gui} based tests for `DocTests::Only`)
 - rust-lang#118325 (Fix Rustdoc search docs link)
 - rust-lang#118327 (Add my work email to the mailmap)

r? `@ghost`
`@rustbot` modify labels: rollup
@rust-log-analyzer
Copy link
Collaborator

A job failed! Check out the build log: (web) (plain)

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

@bors
Copy link
Collaborator

bors commented Nov 26, 2023

💔 Test failed - checks-actions

@bors 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 Nov 26, 2023
@GuillaumeGomez
Copy link
Member Author

Seems spurious...

@bors retry

@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 Nov 26, 2023
@bors
Copy link
Collaborator

bors commented Nov 26, 2023

⌛ Testing commit 5ad57d7 with merge 76713b3...

bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 26, 2023
…llaumeGomez

Rollup of 4 pull requests

Successful merges:

 - rust-lang#118321 (rustdoc: Remove space from fake-variadic fn ptr impls)
 - rust-lang#118322 (skip {tidy,compiletest,rustdoc-gui} based tests for `DocTests::Only`)
 - rust-lang#118325 (Fix Rustdoc search docs link)
 - rust-lang#118327 (Add my work email to the mailmap)

r? `@ghost`
`@rustbot` modify labels: rollup
@rust-log-analyzer
Copy link
Collaborator

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

Click to see the possible cause of the failure (guessed by this bot)
   Compiling rustc_parse v0.0.0 (/checkout/compiler/rustc_parse)
   Compiling rustc_middle v0.0.0 (/checkout/compiler/rustc_middle)
[RUSTC-TIMING] rustc_attr test:false 6.283
[RUSTC-TIMING] rustc_target test:false 27.025
##[error]The runner has received a shutdown signal. This can happen when the runner service is stopped, or a manually started runner is canceled.
[RUSTC-TIMING] rustc_errors test:false 16.537

##[group]Clock drift check
  local time: Mon Nov 27 00:01:50 UTC 2023

@bors
Copy link
Collaborator

bors commented Nov 27, 2023

💔 Test failed - checks-actions

@bors 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 Nov 27, 2023
@GuillaumeGomez GuillaumeGomez deleted the rollup-4tiosec branch November 27, 2023 09:59
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
A-meta Area: Issues & PRs about the rust-lang/rust repository itself rollup A PR which is a rollup S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-libs Relevant to the library 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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants