diff options
Diffstat (limited to 'xtask/src')
-rw-r--r-- | xtask/src/codegen/gen_syntax.rs | 12 | ||||
-rw-r--r-- | xtask/src/lib.rs | 8 |
2 files changed, 15 insertions, 5 deletions
diff --git a/xtask/src/codegen/gen_syntax.rs b/xtask/src/codegen/gen_syntax.rs index db05dcebb..32afd47bc 100644 --- a/xtask/src/codegen/gen_syntax.rs +++ b/xtask/src/codegen/gen_syntax.rs | |||
@@ -68,6 +68,12 @@ fn generate_ast(grammar: AstSrc<'_>) -> Result<String> { | |||
68 | pub(crate) syntax: SyntaxNode, | 68 | pub(crate) syntax: SyntaxNode, |
69 | } | 69 | } |
70 | 70 | ||
71 | impl std::fmt::Display for #name { | ||
72 | fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { | ||
73 | std::fmt::Display::fmt(self.syntax(), f) | ||
74 | } | ||
75 | } | ||
76 | |||
71 | impl AstNode for #name { | 77 | impl AstNode for #name { |
72 | fn can_cast(kind: SyntaxKind) -> bool { | 78 | fn can_cast(kind: SyntaxKind) -> bool { |
73 | match kind { | 79 | match kind { |
@@ -114,6 +120,12 @@ fn generate_ast(grammar: AstSrc<'_>) -> Result<String> { | |||
114 | } | 120 | } |
115 | )* | 121 | )* |
116 | 122 | ||
123 | impl std::fmt::Display for #name { | ||
124 | fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { | ||
125 | std::fmt::Display::fmt(self.syntax(), f) | ||
126 | } | ||
127 | } | ||
128 | |||
117 | impl AstNode for #name { | 129 | impl AstNode for #name { |
118 | fn can_cast(kind: SyntaxKind) -> bool { | 130 | fn can_cast(kind: SyntaxKind) -> bool { |
119 | match kind { | 131 | match kind { |
diff --git a/xtask/src/lib.rs b/xtask/src/lib.rs index 014b61b37..e1472e85d 100644 --- a/xtask/src/lib.rs +++ b/xtask/src/lib.rs | |||
@@ -38,13 +38,11 @@ pub fn project_root() -> PathBuf { | |||
38 | } | 38 | } |
39 | 39 | ||
40 | pub fn run_rustfmt(mode: Mode) -> Result<()> { | 40 | pub fn run_rustfmt(mode: Mode) -> Result<()> { |
41 | let _dir = pushd(project_root()); | ||
41 | ensure_rustfmt()?; | 42 | ensure_rustfmt()?; |
42 | 43 | ||
43 | if mode == Mode::Verify { | 44 | let check = if mode == Mode::Verify { "--check" } else { "" }; |
44 | run!("rustup run {} -- cargo fmt -- --check", TOOLCHAIN)?; | 45 | run!("rustup run {} -- cargo fmt -- {}", TOOLCHAIN, check)?; |
45 | } else { | ||
46 | run!("rustup run {} -- cargo fmt", TOOLCHAIN)?; | ||
47 | } | ||
48 | Ok(()) | 46 | Ok(()) |
49 | } | 47 | } |
50 | 48 | ||