From a2db5adaa6fe6a101c8045209910deb8c36879e8 Mon Sep 17 00:00:00 2001 From: Chris Simpkins Date: Mon, 9 Mar 2020 22:31:11 -0400 Subject: [PATCH 1/2] [tests/running.md] simplify tidy argument --- src/tests/running.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tests/running.md b/src/tests/running.md index f5d8cbdbd..75571b859 100644 --- a/src/tests/running.md +++ b/src/tests/running.md @@ -63,7 +63,7 @@ Likewise, you can test a single file by passing its path: ### Run only the tidy script ```bash -./x.py test src/tools/tidy +./x.py test tidy ``` ### Run tests on the standard library From cfee86e560bca5c744b39729675a512edf79fc19 Mon Sep 17 00:00:00 2001 From: Chris Simpkins Date: Mon, 9 Mar 2020 22:55:10 -0400 Subject: [PATCH 2/2] update all docs to use ./x.py test tidy syntax --- src/conventions.md | 2 +- src/diagnostics/diagnostic-codes.md | 2 +- src/tests/intro.md | 4 ++-- src/tests/running.md | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/conventions.md b/src/conventions.md index 7f7bf32e2..303eedd4e 100644 --- a/src/conventions.md +++ b/src/conventions.md @@ -12,7 +12,7 @@ at the moment, however, it follows a rather more *chaotic* style. We do have some mandatory formatting conventions, which are automatically enforced by a script we affectionately call the "tidy" script. The tidy script runs automatically when you do `./x.py test` and can be run -in isolation with `./x.py test src/tools/tidy`. +in isolation with `./x.py test tidy`. [fmt]: https://github.com/rust-lang-nursery/fmt-rfcs diff --git a/src/diagnostics/diagnostic-codes.md b/src/diagnostics/diagnostic-codes.md index 22d9b12c3..0e923c5e1 100644 --- a/src/diagnostics/diagnostic-codes.md +++ b/src/diagnostics/diagnostic-codes.md @@ -12,7 +12,7 @@ code. This is a bit tricky since the codes are defined in various crates. To do it, run this obscure command: ``` -./x.py test --stage 0 src/tools/tidy +./x.py test --stage 0 tidy ``` This will invoke the tidy script, which generally checks that your code obeys diff --git a/src/tests/intro.md b/src/tests/intro.md index 6691f2d4e..6a528ae45 100644 --- a/src/tests/intro.md +++ b/src/tests/intro.md @@ -61,7 +61,7 @@ including: There is more information in the [section on coding conventions](../conventions.html#formatting). - Example: `./x.py test src/tools/tidy` + Example: `./x.py test tidy` - **Formatting** – Rustfmt is integrated with the build system to enforce uniform style across the compiler. In the CI, we check that the formatting @@ -73,7 +73,7 @@ including: Example: `./x.py fmt` runs rustfmt on the codebase. - Example: `./x.py test src/tools/tidy --bless` does formatting before doing + Example: `./x.py test tidy --bless` does formatting before doing other tidy checks. - **Unit tests** – The Rust standard library and many of the Rust packages diff --git a/src/tests/running.md b/src/tests/running.md index 75571b859..f5c9bdb72 100644 --- a/src/tests/running.md +++ b/src/tests/running.md @@ -72,10 +72,10 @@ Likewise, you can test a single file by passing its path: ./x.py test src/libstd ``` -### Run tests on the standard library and run the tidy script +### Run the tidy script and tests on the standard library ```bash -./x.py test src/libstd src/tools/tidy +./x.py test tidy src/libstd ``` ### Run tests on the standard library using a stage 1 compiler