Skip to content

rustc-docs: Be less specific about the representation of +bundle #100074

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

Merged
merged 1 commit into from
Aug 3, 2022

Conversation

petrochenkov
Copy link
Contributor

For #99429.
r? @bjorn3

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 2, 2022
@petrochenkov
Copy link
Contributor Author

(I guess the alternative with separate files won't fly anyway.)

@bjorn3
Copy link
Member

bjorn3 commented Aug 2, 2022

@bors r+ rollup=always

@bors
Copy link
Collaborator

bors commented Aug 2, 2022

📌 Commit 2bbdc41 has been approved by bjorn3

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 Aug 2, 2022
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 3, 2022
…iaskrgr

Rollup of 6 pull requests

Successful merges:

 - rust-lang#99933 (parallelize HTML checking tool)
 - rust-lang#99958 (Improve position named arguments lint underline and formatting names)
 - rust-lang#100008 (Update all pre-cloned submodules on startup)
 - rust-lang#100049 (:arrow_up: rust-analyzer)
 - rust-lang#100070 (Clarify Cargo.toml comments)
 - rust-lang#100074 (rustc-docs: Be less specific about the representation of `+bundle`)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit e20f7f8 into rust-lang:master Aug 3, 2022
@rustbot rustbot added this to the 1.64.0 milestone Aug 3, 2022
@petrochenkov petrochenkov added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Aug 3, 2022
@petrochenkov
Copy link
Contributor Author

I'm going to beta-nominate this because stabilization PR for bundle (#95818) is already on beta.

@apiraino apiraino added the T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. label Aug 3, 2022
@apiraino
Copy link
Contributor

apiraino commented Aug 3, 2022

I'm going ahead and approve this backport.

@rustbot label +beta-accepted

@rustbot rustbot added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Aug 3, 2022
@Mark-Simulacrum Mark-Simulacrum removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Aug 5, 2022
@Mark-Simulacrum Mark-Simulacrum modified the milestones: 1.64.0, 1.63.0 Aug 5, 2022
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 5, 2022
…mulacrum

[beta] Rollup of beta backports

Includes the following PRs:

*  rustc-docs: Be less specific about the representation of +bundle rust-lang#100074
*  Fix backwards-compatibility check for tests with +whole-archive rust-lang#100068
*  Revert write! and writeln! to late drop temporaries rust-lang#99689
*  Upgrade indexmap and thorin-dwp to use hashbrown 0.12 rust-lang#99251
*  rustdoc: avoid inlining modules with duplicate names rust-lang#99738

r? `@ghost`
@petrochenkov petrochenkov deleted the bundledoc branch February 22, 2025 18:40
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
beta-accepted Accepted for backporting to the compiler in the beta channel. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. 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