diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2021-03-12 14:11:42 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2021-03-12 14:11:42 +0000 |
commit | 393e2356594560dec84e73471f26a366a6fc91dd (patch) | |
tree | fc22518e7df4fdb1d8c17a391932de3fa3eebc41 /xtask/src | |
parent | c0e9530fd095317563532c20f13959619515c9b2 (diff) | |
parent | ebf4448f78abaff3c666b61c3bb8a849db5c9b7f (diff) |
Merge #7980
7980: Fix remaining references to `cargo xtask codegen` r=matklad a=Veykril
Co-authored-by: Lukas Wirth <[email protected]>
Diffstat (limited to 'xtask/src')
-rw-r--r-- | xtask/src/codegen.rs | 2 | ||||
-rw-r--r-- | xtask/src/main.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/xtask/src/codegen.rs b/xtask/src/codegen.rs index 2cf3c6fdc..518e17e38 100644 --- a/xtask/src/codegen.rs +++ b/xtask/src/codegen.rs | |||
@@ -62,7 +62,7 @@ pub(crate) fn ensure_file_contents(file: &Path, contents: &str) -> Result<()> { | |||
62 | let _ = std::fs::create_dir_all(parent); | 62 | let _ = std::fs::create_dir_all(parent); |
63 | } | 63 | } |
64 | std::fs::write(file, contents).unwrap(); | 64 | std::fs::write(file, contents).unwrap(); |
65 | anyhow::bail!("some file were not up to date") | 65 | anyhow::bail!("some file was not up to date and has been updated, simply re-run the tests") |
66 | } | 66 | } |
67 | 67 | ||
68 | fn normalize_newlines(s: &str) -> String { | 68 | fn normalize_newlines(s: &str) -> String { |
diff --git a/xtask/src/main.rs b/xtask/src/main.rs index 35cc7c108..057cd57ae 100644 --- a/xtask/src/main.rs +++ b/xtask/src/main.rs | |||
@@ -1,7 +1,7 @@ | |||
1 | //! See https://github.com/matklad/cargo-xtask/. | 1 | //! See https://github.com/matklad/cargo-xtask/. |
2 | //! | 2 | //! |
3 | //! This binary defines various auxiliary build commands, which are not | 3 | //! This binary defines various auxiliary build commands, which are not |
4 | //! expressible with just `cargo`. Notably, it provides `cargo xtask codegen` | 4 | //! expressible with just `cargo`. Notably, it provides tests via `cargo test -p xtask` |
5 | //! for code generation and `cargo xtask install` for installation of | 5 | //! for code generation and `cargo xtask install` for installation of |
6 | //! rust-analyzer server and client. | 6 | //! rust-analyzer server and client. |
7 | //! | 7 | //! |