Skip to content

Commit 3aaf4e1

Browse files
authored
Merge pull request #2701 from rust-lang/rustc-pull
Rustc pull update
2 parents e4996ea + 97ac2f0 commit 3aaf4e1

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

rust-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
cec70080fd441d16e9fb08a0d1d1a04c72d1ed25
1+
2dc30247c5d8293aaa31e1d7dae2ed2fde908ada

src/rustdoc-internals/rustdoc-json-test-suite.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ This page is specifically about the test suite named `rustdoc-json`, which tests
44
For other test suites used for testing rustdoc, see [§Rustdoc test suites](../tests/compiletest.md#rustdoc-test-suites).
55

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

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

2424
## jsondocck
2525

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

2929
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.
3030

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

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

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

60-
### Argument spliting
60+
### Argument splitting
6161

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

0 commit comments

Comments
 (0)