diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2024-01-11 19:42:53 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-11 19:42:53 +0100 |
| commit | b3d15ebb08ddeecbdcb92e5f2121975a54b901ad (patch) | |
| tree | 192890a5c94360e91ab02d2cd87b7b4d4c2db227 /src/bootstrap | |
| parent | ca17ce4558858baa439922376a947be273de7df8 (diff) | |
| parent | aa696c5a228a2c9730227eb5a0e99fb9d85eb61d (diff) | |
Rollup merge of #119853 - klensy:rustfmt-ignore, r=cuviper
rustfmt.toml: don't ignore just any tests path, only root one Previously ignored any `tests` path, now only /tests at repo root. For reference, https://git-scm.com/docs/gitignore#_pattern_format
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/src/tests/config.rs | 9 | ||||
| -rw-r--r-- | src/bootstrap/src/tests/helpers.rs | 2 |
2 files changed, 7 insertions, 4 deletions
diff --git a/src/bootstrap/src/tests/config.rs b/src/bootstrap/src/tests/config.rs index 6f432343882..c65067f8e8f 100644 --- a/src/bootstrap/src/tests/config.rs +++ b/src/bootstrap/src/tests/config.rs @@ -32,9 +32,12 @@ fn download_ci_llvm() { assert_eq!(parse_llvm("rust.channel = \"dev\""), if_unchanged); assert!(!parse_llvm("rust.channel = \"stable\"")); assert_eq!(parse_llvm("build.build = \"x86_64-unknown-linux-gnu\""), if_unchanged); - assert_eq!(parse_llvm( - "llvm.assertions = true \r\n build.build = \"x86_64-unknown-linux-gnu\" \r\n llvm.download-ci-llvm = \"if-unchanged\"" - ), if_unchanged); + assert_eq!( + parse_llvm( + "llvm.assertions = true \r\n build.build = \"x86_64-unknown-linux-gnu\" \r\n llvm.download-ci-llvm = \"if-unchanged\"" + ), + if_unchanged + ); assert!(!parse_llvm( "llvm.assertions = true \r\n build.build = \"aarch64-apple-darwin\" \r\n llvm.download-ci-llvm = \"if-unchanged\"" )); diff --git a/src/bootstrap/src/tests/helpers.rs b/src/bootstrap/src/tests/helpers.rs index 163594dbb2f..2d626fad417 100644 --- a/src/bootstrap/src/tests/helpers.rs +++ b/src/bootstrap/src/tests/helpers.rs @@ -1,4 +1,4 @@ -use crate::utils::helpers::{extract_beta_rev, hex_encode, make, check_cfg_arg}; +use crate::utils::helpers::{check_cfg_arg, extract_beta_rev, hex_encode, make}; use std::path::PathBuf; #[test] |