Skip to content

Rollup of 6 pull requests - #134359

Closed
GuillaumeGomez wants to merge 11 commits into
rust-lang:masterfrom
GuillaumeGomez:rollup-xszgc84
Closed

Rollup of 6 pull requests#134359
GuillaumeGomez wants to merge 11 commits into
rust-lang:masterfrom
GuillaumeGomez:rollup-xszgc84

Conversation

@GuillaumeGomez

Copy link
Copy Markdown
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

nnethercoteand others added 11 commits December 12, 2024 19:58
All the other unconditional keywords are in the alphabetical order, but
`while` is for some reason not.
`CheckAttrVisitor::check_doc_keyword` checks `#[doc(keyword = "..")]`
attributes to ensure they are on an empty module, and that the value is
a non-empty identifier.
The `rustc::existing_doc_keyword` lint checks these attributes to ensure
that the value is the name of a keyword.
It's silly to have two different checking mechanisms for these
attributes. This commit does the following.
- Changes `check_doc_keyword` to check that the value is the name of a
keyword (avoiding the need for the identifier check, which removes a
dependency on `rustc_lexer`).
- Removes the lint.
- Updates tests accordingly.
There is one hack: the `SelfTy` FIXME case used to used to be handled by
disabling the lint, but now is handled with a special case in
`is_doc_keyword`. That hack will go away if/when the FIXME is fixed.
…d, r=GuillaumeGomez,nnethercote
Remove `rustc::existing_doc_keyword` lint
The check doesn't require a lint.
r? `@GuillaumeGomez`
…ue-const, r=estebank
Make sure to use normalized ty for unevaluated const in default struct value
This cleans up the way that we construct the `mir::Const::Unevaluated` for default struct values. We were previously using `from_unevaluated`, which doesn't normalize the type, and is really only used for inline assembly. Other codepaths (such as `ExprKind::NamedConst`) use the type from the body.
Also, let's stop using `literal_operand`, which also is really not meant for calls other than for literal comparisons in pattern lowering.
Also move all of the tests to a separate subdirectory so they don't need to have the same prefix on all the test files.
Fixesrust-lang#134298
r? estebank or reassign
…-errors
crashes: more tests
try-job: aarch64-apple
try-job: x86_64-msvc
try-job: x86_64-gnu
…ler-errors
Handle fndef rendering together with signature rendering
Pulled out of rust-lang#134353
Changes some highlighting in type mismatch errors around fndefs
@rustbotrustbot added A-rustdoc-json Area: Rustdoc JSON backend 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-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 Dec 16, 2024
@GuillaumeGomez

Copy link
Copy Markdown
MemberAuthor

@bors r+ p=6 rollup=never

@bors

bors commented Dec 16, 2024

Copy link
Copy Markdown
Collaborator

📌 Commit f87653f has been approved by GuillaumeGomez

It is now in the queue for this repository.

@borsbors 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 16, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 16, 2024
…llaumeGomez
Rollup of 6 pull requests
Successful merges:
- rust-lang#134111 (Fix `--nocapture` for run-make tests)
- rust-lang#134202 (Remove `rustc::existing_doc_keyword` lint)
- rust-lang#134314 (Make sure to use normalized ty for unevaluated const in default struct value)
- rust-lang#134329 (Add m68k_target_feature)
- rust-lang#134342 (crashes: more tests)
- rust-lang#134354 (Handle fndef rendering together with signature rendering)
Failed merges:
- rust-lang#133265 (Add a range argument to vec.extract_if)
r? `@ghost`
`@rustbot` modify labels: rollup
@bors

bors commented Dec 16, 2024

Copy link
Copy Markdown
Collaborator

⌛ Testing commit f87653f with merge 80bcb8e...

@matthiaskrgr

Copy link
Copy Markdown
Member

#134111 and #134329 are already merged

@GuillaumeGomez
GuillaumeGomez deleted the rollup-xszgc84 branch December 16, 2024 09:47
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-rustdoc-jsonArea: Rustdoc JSON backendrollupA PR which is a rollupS-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.T-libsRelevant to the library 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.

7 participants

@GuillaumeGomez@bors@matthiaskrgr@rustbot@nnethercote@compiler-errors@oli-obk