Skip to content

Commit 13e480c

Browse files
committed
"in tree" should be "in-tree"
1 parent d15994d commit 13e480c

2 files changed

Lines changed: 6 additions & 6 deletions

File tree

src/external-repos.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ The following external projects are managed using some form of a `subtree`:
2929

3030
In contrast to `submodule` dependencies
3131
(see below for those), the `subtree` dependencies are just regular files and directories which can
32-
be updated in tree. However, if possible, enhancements, bug fixes, etc. specific
32+
be updated in-tree. However, if possible, enhancements, bug fixes, etc. specific
3333
to these tools should be filed against the tools directly in their respective upstream repositories.
3434
The exception is that when rustc changes are required to
3535
implement a new tool feature or test, that should happen in one collective rustc PR.

src/tests/directives.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ means the test won't be compiled or run.
130130
main test files but that `compiletest` should not try to build the file itself.
131131
Please backlink to which main test is actually using the auxiliary file.
132132
* `ignore-test` always ignores the test. This can be used to temporarily disable
133-
a test if it is currently not working, but you want to keep it in tree to
133+
a test if it is currently not working, but you want to keep it in-tree to
134134
re-enable it later.
135135

136136
Some examples of `X` in `ignore-X` or `only-X`:
@@ -211,7 +211,7 @@ settings:
211211
- `needs-target-std` — ignores if target platform does not have std support.
212212
- `ignore-backends` — ignores the listed backends, separated by whitespace characters. Please note
213213
that this directive can be overriden with the `--bypass-ignore-backends=[BACKEND]` command line
214-
flag.
214+
flag.
215215
- `needs-backends` — only runs the test if current codegen backend is listed.
216216
- `needs-offload` — ignores if our LLVM backend was not built with offload support.
217217
- `needs-enzyme` — ignores if our Enzyme submodule was not built.
@@ -290,9 +290,9 @@ You can also force `./x test` to use a specific edition by passing the `-- --edi
290290
However, tests with the `//@ edition` directive will clamp the value passed to the argument.
291291
For example, if we run `./x test -- --edition=2015`:
292292

293-
- A test with the `//@ edition: 2018` will run with the 2018 edition.
294-
- A test with the `//@ edition: 2015..2021` will be run with the 2015 edition.
295-
- A test with the `//@ edition: 2018..` will run with the 2018 edition.
293+
- A test with the `//@ edition: 2018` will run with the 2018 edition.
294+
- A test with the `//@ edition: 2015..2021` will be run with the 2015 edition.
295+
- A test with the `//@ edition: 2018..` will run with the 2018 edition.
296296

297297
### Rustdoc
298298

0 commit comments

Comments
 (0)