diff options
| author | bors <bors@rust-lang.org> | 2020-05-17 16:20:19 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-05-17 16:20:19 +0000 |
| commit | d79f1bd31a1401b5d08096fcdf9a9eb23ddf95df (patch) | |
| tree | 3f05098e7dc5e8c5b27b9d2bf6d5e7e91150806c /src/bootstrap | |
| parent | 34cce58d81f006a5406fcae918db4492e6cf2784 (diff) | |
| parent | 2b3d99d31a0660645cfd338895209da5616a84af (diff) | |
| download | rust-d79f1bd31a1401b5d08096fcdf9a9eb23ddf95df.tar.gz rust-d79f1bd31a1401b5d08096fcdf9a9eb23ddf95df.zip | |
Auto merge of #72295 - RalfJung:rollup-icmhbs7, r=RalfJung
Rollup of 3 pull requests Successful merges: - #72259 (Disallow forbidden usage of non-ascii identifiers.) - #72261 (Break out early on empty span when generate_fn_span) - #72291 (bootstrap: fix typo) Failed merges: r? @ghost
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/format.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bootstrap/format.rs b/src/bootstrap/format.rs index 6653c505bf5..390b7e96b9a 100644 --- a/src/bootstrap/format.rs +++ b/src/bootstrap/format.rs @@ -23,7 +23,7 @@ fn rustfmt(src: &Path, rustfmt: &Path, path: &Path, check: bool) { if !status.success() { eprintln!( "Running `{}` failed.\nIf you're running `tidy`, \ - try again with `--bless` flag. Or, you just want to format \ + try again with `--bless`. Or, if you just want to format \ code, run `./x.py fmt` instead.", cmd_debug, ); |