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.

Sign up for GitHub

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

Jump to bottom

Rollup of 6 pull requests #127148

Closed
wants to merge 14 commits into from
Closed

Rollup of 6 pull requests #127148

wants to merge 14 commits into from

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

WaffleLapkin and others added 14 commits June 24, 2024 10:15
@WaffleLapkin
Add .ignore file to make config.toml searchable in vscode
879d143
@GrigorenkoPV
Small fixme in core now that split_first has no codegen issues
39bf1dc
Updated docs on #[panic_handler] in library/core/src/lib.rs
28ba5e4
@Kobzol
Remove unused compiler dependencies
e52d95b
@notriddle
rustdoc: update to pulldown-cmark 0.11
8b783f1
@notriddle
rustdoc: add usable lint for pulldown-cmark-0.11 parsing changes
61e2f5c
@notriddle
clippy: update to pulldown-cmark 0.11
a5fc783
@tgross35
Print TypeId as a u128 for Debug
682e7c1 
Since <rust-lang#121358>, `TypeId` is
represented as a `(u64, u64)`. This also made the debug implementation a
lot larger, which is especially apparent with pretty formatting.

Make this less noisy by converting the inner value back to a `u128` then
printing as a tuple struct.

Current:

    TypeId { t: (1403077013027291752, 4518903163082958039) }
    TypeId {
        t: (
            1403077013027291752,
            4518903163082958039,
        ),
    }

New:

    TypeId(25882202575019293479932656973818029271)
    TypeId(
        25882202575019293479932656973818029271,
    )
@matthiaskrgr
Rollup merge of rust-lang#126705 - safinaskar:panic, r=Mark-Simulacrum
ab687f3 
Updated docs on `#[panic_handler]` in `library/core/src/lib.rs`
@matthiaskrgr
Rollup merge of rust-lang#126876 - WaffleLapkin:unignoreconfigtoml, r…
67d1328 
…=Mark-Simulacrum

Add `.ignore` file to make `config.toml` searchable in vscode

Based on this answer on [Stack Overflow](https://stackoverflow.com/a/72059075).
@matthiaskrgr
Rollup merge of rust-lang#126906 - GrigorenkoPV:fixme-split_at_first,…
6fc769b 
… r=Mark-Simulacrum

Small fixme in core now that split_first has no codegen issues

rust-lang#109328 (comment)

BTW, I have a crate implementing exactly this kind of an iterator: https://github.com/GrigorenkoPV/head-tail-iter and I was wondering if it would be worthwhile to try and make an ACP for it to get it included in std (or maybe itertools). My only doubt is that it kinda incentives writing O(n^2) algorithms and is not the hard to replace with a `while let` loop (just as in this PR).
@matthiaskrgr
Rollup merge of rust-lang#127127 - notriddle:notriddle/pulldown-cmark…
a8cf593 
…-0.11, r=GuillaumeGomez

rustdoc: update to pulldown-cmark 0.11

r? rustdoc

This pull request updates rustdoc to the latest version of pulldown-cmark. Along with adding new markdown extensions (which this PR doesn't enable), the new pulldown-cmark version also fixes a large number of bugs. Because all text files successfully parse as markdown, these bugfixes change the output, which can break people's existing docs.

A crater run, rust-lang#121659, has already been run for this change.

The first commit upgrades and fixes rustdoc. The second commit adds a lint for the footnote and block quote parser changes, which break the largest numbers of docs in the Crater run. The strikethrough change was mitigated in pulldown-cmark itself.

Unblocks rust-lang/rust-clippy#12876
@matthiaskrgr
Rollup merge of rust-lang#127131 - Kobzol:remove-unused-deps, r=compi…
da8bd26 
…ler-errors

Remove unused `rustc_trait_selection` dependencies

Found using `cargo-machete`. The `bitflags` and `derivative` crates were added for the new trait solver, but weren't removed when the next trait solver code was uplifted to a separate crate.
@matthiaskrgr
Rollup merge of rust-lang#127134 - tgross35:typeid-debug, r=Nilstrieb
5d7da40 
Print `TypeId` as a `u128` for `Debug`

Since <rust-lang#121358>, `TypeId` is represented as a `(u64, u64)`. This also made the debug implementation a lot larger, which is especially apparent with pretty formatting.

Change this to convert the inner value back to a `u128` and then print as a tuple struct to make this less noisy.

Current:

    TypeId { t: (1403077013027291752, 4518903163082958039) }
    TypeId {
        t: (
            1403077013027291752,
            4518903163082958039,
        ),
    }

New:

    TypeId(25882202575019293479932656973818029271)
    TypeId(
        25882202575019293479932656973818029271,
    )
@rustbot rustbot added A-meta Area: Issues about the rust-lang/rust repository. 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-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) 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 Jun 30, 2024
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=6

@bors
Copy link
Contributor

bors commented Jun 30, 2024

📌 Commit 5d7da40 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 Jun 30, 2024
@bors
Copy link
Contributor

bors commented Jun 30, 2024

⌛ Testing commit 5d7da40 with merge d833867...

bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 30, 2024
@bors
Auto merge of rust-lang#127148 - matthiaskrgr:rollup-1vumc1z, r=matth…
d833867 
…iaskrgr

Rollup of 6 pull requests

Successful merges:

 - rust-lang#126705 (Updated docs on `#[panic_handler]` in `library/core/src/lib.rs`)
 - rust-lang#126876 (Add `.ignore` file to make `config.toml` searchable in vscode)
 - rust-lang#126906 (Small fixme in core now that split_first has no codegen issues)
 - rust-lang#127127 (rustdoc: update to pulldown-cmark 0.11)
 - rust-lang#127131 (Remove unused `rustc_trait_selection` dependencies)
 - rust-lang#127134 (Print `TypeId` as a `u128` for `Debug`)

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

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

Click to see the possible cause of the failure (guessed by this bot) 
 Documenting rustc_codegen_llvm v0.0.0 (/Users/runner/work/rust/rust/compiler/rustc_codegen_llvm)
error: unportable markdown
   --> compiler/rustc_mir_transform/src/coverage/spans/from_mir.rs:218:48
    |
218 | /// Returns an extrapolated span (pre-expansion[^1]) corresponding to a range
    |                                                |
    |                                                |
    |                                                help: if it should not be a footnote, escape it: `\`
    |
    = note: `-D rustdoc::unportable-markdown` implied by `-D warnings`
    = help: to override `-D warnings` add `#[allow(rustdoc::unportable_markdown)]`
error: unportable markdown
   --> compiler/rustc_mir_transform/src/coverage/spans/from_mir.rs:223:5
    |
    |
223 | /// [^1]Expansions result from Rust syntax including macros, syntactic sugar,
    |     |
    |     |
    |     help: if it should not be a footnote, escape it: `\`
error: could not document `rustc_mir_transform`
warning: build failed, waiting for other jobs to finish...
Build completed unsuccessfully in 0:49:43
  local time: Sun Jun 30 08:13:27 UTC 2024

@bors
Copy link
Contributor

bors commented Jun 30, 2024

💔 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 Jun 30, 2024
@matthiaskrgr matthiaskrgr mentioned this pull request Jun 30, 2024
Merged
@matthiaskrgr matthiaskrgr deleted the rollup-1vumc1z branch September 1, 2024 17:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
A-meta Area: Issues about the rust-lang/rust repository. A-testsuite Area: The testsuite used to check the correctness of rustc 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-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.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@matthiaskrgr @bors @rust-log-analyzer @rustbot @WaffleLapkin @GrigorenkoPV @Kobzol @notriddle @tgross35