Package `rust-docs-json` into nightly components (take 3) #102241

jyn514 · 2022-09-24T17:52:50Z

dist creates a rust-docs-json.tar.xz tarfile. But build-manifest expected it to be named rust-docs-json-preview.tar.xz. Change build-manifest to allow the name without the -preview suffix.

I haven't actually tested this :( build-manifest is a pain to run locally.

rust-highfive · 2022-09-24T17:52:53Z

r? @Mark-Simulacrum

(rust-highfive has picked a reviewer for you, use r? to override)

Mark-Simulacrum · 2022-09-29T12:52:11Z

@bors try

Let's get a nightly built from a try build for testing...

bors · 2022-09-29T12:52:49Z

⌛ Trying commit da9eae4acff8c154cba2f16813b2ec892d0634b5 with merge df45d84f02a9ab1ce5291952e9c8d6b2333b1cc4...

bors · 2022-09-29T14:27:14Z

☀️ Try build successful - checks-actions
Build commit: df45d84f02a9ab1ce5291952e9c8d6b2333b1cc4 (df45d84f02a9ab1ce5291952e9c8d6b2333b1cc4)

Mark-Simulacrum · 2022-09-29T15:12:13Z

Kicked off a dev-static release -- should go through in ~15-30 minutes, and you can test there (RUSTUP_DIST_SERVER=https://dev-static.rust-lang.org rustup toolchain install nightly). If that seems to works r=me.

jyn514 · 2022-09-30T20:06:50Z

@bors try

bors · 2022-09-30T20:06:59Z

⌛ Trying commit 8552d8396cadaacbea3bcdd5c8cc3abf7ae104a7 with merge f287ccfb60c0b4c271c3616977d2b1aa1f30c4a8...

src/bootstrap/dist.rs

jyn514 · 2022-09-30T21:18:48Z

@bors try

bors · 2022-09-30T21:18:57Z

⌛ Trying commit 414f3c6bbcd147e51b80dd012ef65bb6b0c1c97f with merge 3d1bf40645cf937b72ea529504230010a8271521...

bors · 2022-09-30T23:09:19Z

☀️ Try build successful - checks-actions
Build commit: 3d1bf40645cf937b72ea529504230010a8271521 (3d1bf40645cf937b72ea529504230010a8271521)

LukeMathWalker · 2022-10-01T10:44:56Z

I assume we need another dev-static release to test it out again via rustup?

Mark-Simulacrum · 2022-10-01T14:23:55Z

New dev-static release should be ready to go.

`dist` creates a `rust-docs-json.tar.xz` tarfile. But build-manifest expected it to be named `rust-docs-json-preview.tar.xz`. Change build-manifest to allow the name without the `-preview` suffix. This also adds `rust-docs-json` to the `rust` component. I'm not quite sure why it exists, but rustup uses it to determine which components are available.

jyn514 · 2022-10-01T20:39:21Z

@bors try

bors · 2022-10-01T20:39:33Z

⌛ Trying commit d44e142 with merge 40aa91e53ff73bab6a4ea72953179be69eff920b...

bors · 2022-10-01T22:10:37Z

☀️ Try build successful - checks-actions
Build commit: 40aa91e53ff73bab6a4ea72953179be69eff920b (40aa91e53ff73bab6a4ea72953179be69eff920b)

Mark-Simulacrum · 2022-10-01T22:27:21Z

Started a dev-static promotion for the try build.

jyn514 · 2022-10-02T03:26:33Z

This is finally working 🎉

; RUSTUP_DIST_SERVER=https://dev-static.rust-lang.org rustup component add --toolchain nightly-2022-10-01-x86_64-unknown-linux-gnu rust-docs-json
info: downloading component 'rust-docs-json'
info: installing component 'rust-docs-json
; ls /home/jnelson/.local/lib/rustup/toolchains/nightly-2022-10-01-x86_64-unknown-linux-gnu/share/doc/rust/json
alloc.json  core.json  proc_macro.json  std.json  test.json

Mark-Simulacrum · 2022-10-04T12:37:51Z

@bors r+ rollup

bors · 2022-10-04T12:37:52Z

📌 Commit d44e142 has been approved by Mark-Simulacrum

It is now in the queue for this repository.

…iaskrgr Rollup of 6 pull requests Successful merges: - rust-lang#102241 (Package `rust-docs-json` into nightly components (take 3)) - rust-lang#102488 (Check generic argument compatibility when projecting assoc ty) - rust-lang#102647 (Only allow ~const bounds for traits with #[const_trait]) - rust-lang#102648 (Add test for rust-lang#102605) - rust-lang#102651 (It's not about types or consts, but the lack of regions) - rust-lang#102653 (resolve instance: missing value to `delay_span_bug`) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup

…yn514 Document `rust-docs-json` component Follow up to rust-lang#102241 r? `@jyn514`

…yn514 Document `rust-docs-json` component Follow up to rust-lang#102241 r? ``@jyn514``

…yn514 Document `rust-docs-json` component Follow up to rust-lang#102241 r? ```@jyn514```

…yn514 Document `rust-docs-json` component Follow up to rust-lang#102241 r? ````@jyn514````

…rk-Simulacrum Refactor build-manifest to minimize the number of changes needed to add a new component - Add all components to `PkgType` - Automate functionality wherever possible, so functions often don't have to be manually edited - Where that's not possible, use exhaustive matches on `PkgType` instead of adding individual strings. - Add documentation for how to add a component. Improve the existing documentation for how to test changes. I tested locally that this generates an identical manifest before and after my change, as follows: ```sh git checkout d44e142 cargo +nightly run --manifest-path src/tools/build-manifest/Cargo.toml build/dist build/manifest-before 1970-01-01 http://example.com nightly git checkout refactor-build-manifest cargo +nightly run --manifest-path src/tools/build-manifest/Cargo.toml build/dist build/manifest-before 1970-01-01 http://example.com nightly sort -u build/manifest-before/channel-rust-nightly.toml | diff - <(sort -u build/manifest-after/channel-rust-nightly.toml) ``` I then verified by hand that the differences before sorting are inconsequential (mostly targets being slightly reordered). The only change in behavior is that `llvm-tools` is now properly renamed to `llvm-tools-preview`: ``` ; sort -u build/manifest-before/channel-rust-nightly.toml | diff - <(sort -u build/manifest-after/channel-rust-nightly.toml) 784a785 > [renames.llvm-tools] 894a896 > to = "llvm-tools-preview" ``` This is based on rust-lang#102241 and should not be merged before.

…crum Refactor build-manifest to minimize the number of changes needed to add a new component - Add all components to `PkgType` - Automate functionality wherever possible, so functions often don't have to be manually edited - Where that's not possible, use exhaustive matches on `PkgType` instead of adding individual strings. - Add documentation for how to add a component. Improve the existing documentation for how to test changes. I tested locally that this generates an identical manifest before and after my change, as follows: ```sh git checkout d44e14225ab00e164aa9ea9e8d9e1bee40f96b3e cargo +nightly run --manifest-path src/tools/build-manifest/Cargo.toml build/dist build/manifest-before 1970-01-01 http://example.com nightly git checkout refactor-build-manifest cargo +nightly run --manifest-path src/tools/build-manifest/Cargo.toml build/dist build/manifest-before 1970-01-01 http://example.com nightly sort -u build/manifest-before/channel-rust-nightly.toml | diff - <(sort -u build/manifest-after/channel-rust-nightly.toml) ``` I then verified by hand that the differences before sorting are inconsequential (mostly targets being slightly reordered). The only change in behavior is that `llvm-tools` is now properly renamed to `llvm-tools-preview`: ``` ; sort -u build/manifest-before/channel-rust-nightly.toml | diff - <(sort -u build/manifest-after/channel-rust-nightly.toml) 784a785 > [renames.llvm-tools] 894a896 > to = "llvm-tools-preview" ``` This is based on rust-lang/rust#102241 and should not be merged before.

rust-highfive assigned Mark-Simulacrum Sep 24, 2022

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 24, 2022

jyn514 added the T-release Relevant to the release subteam, which will review and decide on the PR/issue. label Sep 24, 2022

jyn514 force-pushed the manifest-json-docs branch from da9eae4 to 8552d83 Compare September 30, 2022 20:06

rustbot added the T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) label Sep 30, 2022

LukeMathWalker reviewed Sep 30, 2022

View reviewed changes

src/bootstrap/dist.rs Show resolved Hide resolved

jyn514 added 2 commits October 1, 2022 15:38

Give better errors when build-manifest fails

d44e142

jyn514 force-pushed the manifest-json-docs branch from 414f3c6 to d44e142 Compare October 1, 2022 20:38

jyn514 mentioned this pull request Oct 2, 2022

Refactor build-manifest to minimize the number of changes needed to add a new component #102565

Merged

LukeMathWalker mentioned this pull request Oct 2, 2022

Handle re-exported types LukeMathWalker/pavex#2

Merged

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 Oct 4, 2022

matthiaskrgr mentioned this pull request Oct 4, 2022

Rollup of 6 pull requests #102666

Merged

bors merged commit b9ff789 into rust-lang:master Oct 4, 2022

rustbot added this to the 1.66.0 milestone Oct 4, 2022

jyn514 deleted the manifest-json-docs branch October 4, 2022 20:42

aDotInTheVoid mentioned this pull request Oct 8, 2022

Document rust-docs-json component #102807

Merged

matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Oct 8, 2022

Rollup merge of rust-lang#102807 - aDotInTheVoid:rdj-rustup-docs, r=j…

9f7213f

…yn514 Document `rust-docs-json` component Follow up to rust-lang#102241 r? `@jyn514`

matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Oct 8, 2022

Rollup merge of rust-lang#102807 - aDotInTheVoid:rdj-rustup-docs, r=j…

274ab43

…yn514 Document `rust-docs-json` component Follow up to rust-lang#102241 r? ``@jyn514``

matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Oct 8, 2022

Rollup merge of rust-lang#102807 - aDotInTheVoid:rdj-rustup-docs, r=j…

4db122a

…yn514 Document `rust-docs-json` component Follow up to rust-lang#102241 r? ```@jyn514```

notriddle added a commit to notriddle/rust that referenced this pull request Oct 9, 2022

Rollup merge of rust-lang#102807 - aDotInTheVoid:rdj-rustup-docs, r=j…

8c4191a

…yn514 Document `rust-docs-json` component Follow up to rust-lang#102241 r? ````@jyn514````

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Package `rust-docs-json` into nightly components (take 3) #102241

Package `rust-docs-json` into nightly components (take 3) #102241

jyn514 commented Sep 24, 2022

rust-highfive commented Sep 24, 2022

Mark-Simulacrum commented Sep 29, 2022

bors commented Sep 29, 2022

bors commented Sep 29, 2022

Mark-Simulacrum commented Sep 29, 2022

jyn514 commented Sep 30, 2022

bors commented Sep 30, 2022

jyn514 commented Sep 30, 2022

bors commented Sep 30, 2022

bors commented Sep 30, 2022

LukeMathWalker commented Oct 1, 2022

Mark-Simulacrum commented Oct 1, 2022

jyn514 commented Oct 1, 2022

bors commented Oct 1, 2022

bors commented Oct 1, 2022

Mark-Simulacrum commented Oct 1, 2022

jyn514 commented Oct 2, 2022

Mark-Simulacrum commented Oct 4, 2022

bors commented Oct 4, 2022

Package rust-docs-json into nightly components (take 3) #102241

Package rust-docs-json into nightly components (take 3) #102241

Conversation

jyn514 commented Sep 24, 2022

rust-highfive commented Sep 24, 2022

Mark-Simulacrum commented Sep 29, 2022

bors commented Sep 29, 2022

bors commented Sep 29, 2022

Mark-Simulacrum commented Sep 29, 2022

jyn514 commented Sep 30, 2022

bors commented Sep 30, 2022

jyn514 commented Sep 30, 2022

bors commented Sep 30, 2022

bors commented Sep 30, 2022

LukeMathWalker commented Oct 1, 2022

Mark-Simulacrum commented Oct 1, 2022

jyn514 commented Oct 1, 2022

bors commented Oct 1, 2022

bors commented Oct 1, 2022

Mark-Simulacrum commented Oct 1, 2022

jyn514 commented Oct 2, 2022

Mark-Simulacrum commented Oct 4, 2022

bors commented Oct 4, 2022

Package `rust-docs-json` into nightly components (take 3) #102241

Package `rust-docs-json` into nightly components (take 3) #102241