Partial revert of 3085b548ecbd7d29d40c6180609ea3c224bad857 #14319
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This is to quickly resolve a test failure from rust-lang#14318
rustbot
added
the
S-waiting-on-review
weihanglo
approved these changes
Jul 29, 2024
There was a problem hiding this comment.
So this failed because of unordered JSON output for cargo doc? Seems fine reverting it at this moment.
---- doc::doc_json_artifacts stdout ----
running `/Users/runner/work/cargo/cargo/target/debug/cargo doc --message-format=json`
thread 'doc::doc_json_artifacts' panicked at tests/testsuite/doc.rs:2009:10:
---- expected: tests/testsuite/doc.rs:1920:13
++++ actual: stdout
1 1 | [
2 2 | {
3 3 | "executable": null,
4 4 | "features": [],
5 5 | "filenames": [
6 + "[ROOT]/foo/target/doc/foo/index.html"
7 + ],
8 + "fresh": false,
9 + "manifest_path": "[ROOT]/foo/Cargo.toml",
10 + "package_id": "path+[ROOTURL]/foo#0.0.1",
11 + "profile": "{...}",
12 + "reason": "compiler-artifact",
13 + "target": {
14 + "crate_types": [
15 + "lib"
16 + ],
17 + "doc": true,
18 + "doctest": true,
19 + "edition": "2015",
20 + "kind": [
21 + "lib"
22 + ],
23 + "name": "foo",
24 + "src_path": "[ROOT]/foo/src/lib.rs",
25 + "test": true
26 + }
27 + },
28 + {
29 + "executable": null,
30 + "features": [],
31 + "filenames": [
6 32 | "[ROOT]/foo/target/debug/deps/libfoo-[HASH].rmeta"
7 33 | ],
8 34 | "fresh": false,
9 35 | "manifest_path": "[ROOT]/foo/Cargo.toml",
10 36 | "package_id": "path+[ROOTURL]/foo#0.0.1",
⋮
27 53 | },
28 54 | {
29 55 | "executable": null,
30 56 | "features": [],
31 57 | "filenames": [
32 - "[ROOT]/foo/target/doc/foo/index.html"
33 - ],
34 - "fresh": false,
35 - "manifest_path": "[ROOT]/foo/Cargo.toml",
36 - "package_id": "path+[ROOTURL]/foo#0.0.1",
37 - "profile": "{...}",
38 - "reason": "compiler-artifact",
39 - "target": {
40 - "crate_types": [
41 - "lib"
42 - ],
43 - "doc": true,
44 - "doctest": true,
45 - "edition": "2015",
46 - "kind": [
47 - "lib"
48 - ],
49 - "name": "foo",
50 - "src_path": "[ROOT]/foo/src/lib.rs",
51 - "test": true
52 - }
53 - },
54 - {
55 - "executable": null,
56 - "features": [],
57 - "filenames": [
58 58 | "[ROOT]/foo/target/doc/somebin/index.html"
59 59 | ],
60 60 | "fresh": false,
61 61 | "manifest_path": "[ROOT]/foo/Cargo.toml",
62 62 | "package_id": "path+[ROOTURL]/foo#0.0.1",
⋮
80 80 | {
81 81 | "reason": "build-finished",
82 82 | "success": true
83 83 | }
84 84 | ]∅
|
@bors r+ |
bors
added
S-waiting-on-bors
|
☀️ Test successful - checks-actions |
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jul 31, 2024
Update cargo 5 commits in b5d44db1daf0469b227a6211b987162a39a54730..257b72b8adfb1f2aa9916cefca67285c21666276 2024-07-26 21:27:12 +0000 to 2024-07-30 15:08:27 +0000 - chore: Update toml (rust-lang/cargo#14324) - dont call wrap in a no-op source_id::with* (rust-lang/cargo#14318) - Partial revert of 3085b548ecbd7d29d40c6180609ea3c224bad857 (rust-lang/cargo#14319) - chore(deps): update msrv (rust-lang/cargo#14303) - Fix warnings building tests on Windows (rust-lang/cargo#14315) r? ghost
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is to quickly resolve a test failure from #14318