Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
01e47df
chore: fix some minor issues in the comments
xiaolinny Dec 9, 2025
fbfdb20
Auto merge of #149948 - WaffleLapkin:dereferenceablen't, r=RalfJung
bors Dec 16, 2025
e675d6d
Auto merge of #149442 - chenyukang:yukang-fix-mark-span-note-144304, …
bors Dec 16, 2025
b219978
Rollup merge of #147939 - theemathas:add-const-supertrait, r=oli-obk
JonathanBrouwer Dec 16, 2025
b73a180
Rollup merge of #149734 - Kobzol:gcc-9.2.0, r=marcoieni
JonathanBrouwer Dec 16, 2025
857cd5c
Rollup merge of #149767 - reddevilmidzy:t11, r=Kivooeo
JonathanBrouwer Dec 16, 2025
307c15b
Rollup merge of #149804 - xiaolinny:main, r=lcnr
JonathanBrouwer Dec 16, 2025
a2468cb
Rollup merge of #149967 - folkertdev:va-list-hexagon, r=workingjubilee
JonathanBrouwer Dec 16, 2025
be039ea
Rollup merge of #150025 - BoxyUwU:mgca_no_unused_defids, r=oli-obk
JonathanBrouwer Dec 16, 2025
611106c
Rollup merge of #150032 - Kivooeo:annotate-snippets-stable, r=Muscraft
JonathanBrouwer Dec 16, 2025
cced27d
Rollup merge of #150033 - izagawd:try_as_dyn, r=oli-obk
JonathanBrouwer Dec 16, 2025
960d0a3
Rollup merge of #150042 - tshepang:rdg-sync, r=tshepang
JonathanBrouwer Dec 16, 2025
a74b04f
Rollup merge of #150063 - workingjubilee:remove-let-else-deny, r=Kivooeo
JonathanBrouwer Dec 16, 2025
946c18e
Rollup merge of #150064 - Ayush1325:uefi-io-repr-comment, r=bjorn3
JonathanBrouwer Dec 16, 2025
08ec2a0
Auto merge of #150068 - JonathanBrouwer:rollup-45j7puz, r=JonathanBro…
bors Dec 16, 2025
1f39096
Prepare for merging from rust-lang/rust
invalid-email-address Dec 17, 2025
97ac2f0
Merge ref '2dc30247c5d8' from rust-lang/rust
invalid-email-address Dec 17, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion rust-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
cec70080fd441d16e9fb08a0d1d1a04c72d1ed25
2dc30247c5d8293aaa31e1d7dae2ed2fde908ada
10 changes: 5 additions & 5 deletions src/rustdoc-internals/rustdoc-json-test-suite.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ This page is specifically about the test suite named `rustdoc-json`, which tests
For other test suites used for testing rustdoc, see [§Rustdoc test suites](../tests/compiletest.md#rustdoc-test-suites).

Tests are run with compiletest, and have access to the usual set of [directives](../tests/directives.md).
Frequenly used directives here are:
Frequently used directives here are:

- [`//@ aux-build`][aux-build] to have dependencies.
- `//@ edition: 2021` (or some other edition).
Expand All @@ -23,8 +23,8 @@ Also, talk about how it works

## jsondocck

[jsondocck] processes direcives given in comments, to assert that the values in the output are expected.
It's alot like [htmldocck](./rustdoc-test-suite.md) in that way.
[jsondocck] processes directives given in comments, to assert that the values in the output are expected.
It's a lot like [htmldocck](./rustdoc-test-suite.md) in that way.

It uses [JSONPath] as a query language, which takes a path, and returns a *list* of values that that path is said to match to.

Expand All @@ -48,7 +48,7 @@ These are defined in [`directive.rs`].
Values can be either JSON values, or variables.

- JSON values are JSON literals, e.g. `true`, `"string"`, `{"key": "value"}`.
These often need to be quoted using `'`, to be processed as 1 value. See [§Argument spliting](#argument-spliting)
These often need to be quoted using `'`, to be processed as 1 value. See [§Argument splitting](#argument-splitting)
- Variables can be used to store the value in one path, and use it in later queries.
They are set with the `//@ set <name> = <path>` directive, and accessed with `$<name>`

Expand All @@ -57,7 +57,7 @@ Values can be either JSON values, or variables.
//@ is $.some.other.path $foo
```

### Argument spliting
### Argument splitting

Arguments to directives are split using the [shlex] crate, which implements POSIX shell escaping.
This is because both `<path>` and `<value>` arguments to [directives](#directives) frequently have both
Expand Down
Loading