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 5 pull requests #95322

Closed
wants to merge 14 commits into from
Closed

Conversation

Dylan-DPC
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

cjgillot and others added 14 commits March 20, 2022 20:36
Taking a Diagnostic by move would break the usual pattern
`diag.label(..).emit()`.
RustyHermit now maintains custom json targets, which are distributed with the kernel. [1]

[1]: hermit-os/kernel#395
Remove `Session::one_time_diagnostic`

This is untracked mutable state, which modified the behaviour of queries.
It was used for 2 things: some full-blown errors, but mostly for lint declaration notes ("the lint level is defined here" notes).

It is replaced by the diagnostic deduplication infra which already exists in the diagnostic emitter.
A new diagnostic level `OnceNote` is introduced specifically for lint notes, to deduplicate subdiagnostics.

As a drive-by, diagnostic emission takes a `&mut` to allow dropping the `SubDiagnostic`s.
Fix inaccurate function name in `rustc_const_eval` docs

Looks to me like this fixes rust-lang#85513. I had trouble making a intra-docs link to `eval_place_to_op` work, though...
…iplett

Remove hermitkernel targets

RustyHermit now maintains custom json targets, which are distributed with the kernel: hermit-os/kernel#395

See hermit-os/hermit-rs#197 (comment)
CC: ``@stlankes,`` ``@bstrie``
std::process docs: linkify references to output, spawn and status
@rustbot 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 Mar 26, 2022
@Dylan-DPC
Copy link
Member Author

@bors r+ rollup=never p=5

@bors
Copy link
Contributor

bors commented Mar 26, 2022

📌 Commit 1a6ff67 has been approved by Dylan-DPC

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Mar 26, 2022
@bors
Copy link
Contributor

bors commented Mar 26, 2022

⌛ Testing commit 1a6ff67 with merge fcb816c00646f39b3778cbcf56f787f9cb67ee4c...

@bors
Copy link
Contributor

bors commented Mar 26, 2022

💔 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 Mar 26, 2022
@rust-log-analyzer
Copy link
Collaborator

The job mingw-check failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)
    Checking clippy_lints v0.1.61 (/checkout/src/tools/clippy/clippy_lints)
error[E0308]: mismatched types
   --> src/tools/clippy/clippy_lints/src/regex.rs:165:56
    |
165 |                         str_span(expr.span, *e.span(), offset),
    |                                                        ^^^^^^ expected `u16`, found `u8`
    |
help: you can convert a `u8` to a `u16`
    |
165 |                         str_span(expr.span, *e.span(), offset.into()),

error[E0308]: mismatched types
   --> src/tools/clippy/clippy_lints/src/regex.rs:173:56
    |
    |
173 |                         str_span(expr.span, *e.span(), offset),
    |                                                        ^^^^^^ expected `u16`, found `u8`
    |
help: you can convert a `u8` to a `u16`
    |
173 |                         str_span(expr.span, *e.span(), offset.into()),

For more information about this error, try `rustc --explain E0308`.
error: could not compile `clippy_lints` due to 2 previous errors
Build completed unsuccessfully in 0:03:40

@rust-log-analyzer
Copy link
Collaborator

The job mingw-check failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)
    Checking clippy_lints v0.1.61 (/checkout/src/tools/clippy/clippy_lints)
error[E0308]: mismatched types
   --> src/tools/clippy/clippy_lints/src/regex.rs:165:56
    |
165 |                         str_span(expr.span, *e.span(), offset),
    |                                                        ^^^^^^ expected `u16`, found `u8`
    |
help: you can convert a `u8` to a `u16`
    |
165 |                         str_span(expr.span, *e.span(), offset.into()),

error[E0308]: mismatched types
   --> src/tools/clippy/clippy_lints/src/regex.rs:173:56
    |
    |
173 |                         str_span(expr.span, *e.span(), offset),
    |                                                        ^^^^^^ expected `u16`, found `u8`
    |
help: you can convert a `u8` to a `u16`
    |
173 |                         str_span(expr.span, *e.span(), offset.into()),

For more information about this error, try `rustc --explain E0308`.
error: could not compile `clippy_lints` due to 2 previous errors
Build completed unsuccessfully in 0:03:35

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
rollup A PR which is a rollup 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-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