diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2022-06-13 07:22:04 +0000 |
|---|---|---|
| committer | GitHub <[email protected]> | 2022-06-13 07:22:04 +0000 |
| commit | db685c04049449ac3e4f256f2e7e26dad550d94c (patch) | |
| tree | f4ec5de70ec05e793a774049e010935ac45853ed /xtask | |
| parent | fff0a03fe0f9e84209dd40fd8f93790871d03d75 (diff) | |
| parent | a8703b75988e1e700af701116464025679d2feb8 (diff) | |
Merge #808
808: Add rustfmt.toml with some nice settings. r=lulf a=Dirbaio
Co-authored-by: Dario Nieuwenhuis <[email protected]>
Diffstat (limited to 'xtask')
| -rw-r--r-- | xtask/src/main.rs | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/xtask/src/main.rs b/xtask/src/main.rs index d8d5e07da..b8b453fd0 100644 --- a/xtask/src/main.rs +++ b/xtask/src/main.rs | |||
| @@ -1,10 +1,9 @@ | |||
| 1 | #![allow(dead_code)] | 1 | #![allow(dead_code)] |
| 2 | #![deny(unused_must_use)] | 2 | #![deny(unused_must_use)] |
| 3 | 3 | ||
| 4 | use std::format; | 4 | use std::path::{Path, PathBuf}; |
| 5 | use std::{env, fs, path::PathBuf}; | 5 | use std::{env, format, fs}; |
| 6 | 6 | ||
| 7 | use std::path::Path; | ||
| 8 | use walkdir::WalkDir; | 7 | use walkdir::WalkDir; |
| 9 | use xshell::{cmd, Cmd}; | 8 | use xshell::{cmd, Cmd}; |
| 10 | use yaml_rust::YamlLoader; | 9 | use yaml_rust::YamlLoader; |
| @@ -67,10 +66,7 @@ impl Realm { | |||
| 67 | fn task_check(realm: Realm) -> Result<(), anyhow::Error> { | 66 | fn task_check(realm: Realm) -> Result<(), anyhow::Error> { |
| 68 | let _e = xshell::pushenv("CI", "true"); | 67 | let _e = xshell::pushenv("CI", "true"); |
| 69 | 68 | ||
| 70 | let matrix_yaml = root_dir() | 69 | let matrix_yaml = root_dir().join(".github").join("workflows").join("rust.yml"); |
| 71 | .join(".github") | ||
| 72 | .join("workflows") | ||
| 73 | .join("rust.yml"); | ||
| 74 | 70 | ||
| 75 | let matrix = YamlLoader::load_from_str(&*fs::read_to_string(matrix_yaml).unwrap()).unwrap(); | 71 | let matrix = YamlLoader::load_from_str(&*fs::read_to_string(matrix_yaml).unwrap()).unwrap(); |
| 76 | 72 | ||
