diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2025-01-24 08:08:08 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-01-24 08:08:08 +0100 |
| commit | 40e28582bb95e33f762dea75b78f6ebb5c29b836 (patch) | |
| tree | 759640bbd7f693628a1fbf62e45b7418e74fa46d /src/tools | |
| parent | 042da354e99fb05600c293e12bdfe2b4444eb10b (diff) | |
| parent | 9c0e32bcd2727e95371f20fd7c9b86bc139e478e (diff) | |
Rollup merge of #135799 - aDotInTheVoid:skrrt-skrrt-revrrt, r=GuillaumeGomez
rustdoc-json: Rename `Path::name` to `path`, and give it the path again. Closes: #135600. Reverts #134880 (Effectively, but not actually, as the `FORMAT_VERSION` needs to be bumped, changed docs/tests). CC `@AS1100K.` Also CC `@obi1kenobi` `@LukeMathWalker` Still needs before being merge-ready: - [x] Tests for cross-crate paths - [x] (Maybe) Document what the field does. - [x] Decide if the field rename is good (https://github.com/rust-lang/rust/pull/135799#issuecomment-2605937831) - [ ] Squash commits. r? `@GuillaumeGomez`
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/jsondoclint/src/validator/tests.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/tools/jsondoclint/src/validator/tests.rs b/src/tools/jsondoclint/src/validator/tests.rs index 7fcb8ffd1f9..a37e6c2eb5c 100644 --- a/src/tools/jsondoclint/src/validator/tests.rs +++ b/src/tools/jsondoclint/src/validator/tests.rs @@ -163,7 +163,7 @@ fn errors_on_missing_path() { sig: FunctionSignature { inputs: vec![], output: Some(Type::ResolvedPath(Path { - name: "Bar".to_owned(), + path: "Bar".to_owned(), id: Id(1), args: None, })), @@ -191,7 +191,7 @@ fn errors_on_missing_path() { check(&krate, &[Error { kind: ErrorKind::Custom( - r#"No entry in '$.paths' for Path { name: "Bar", id: Id(1), args: None }"#.to_owned(), + r#"No entry in '$.paths' for Path { path: "Bar", id: Id(1), args: None }"#.to_owned(), ), id: Id(1), }]); |
