Skip to content

Rollup of 10 pull requests #68201

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 23 commits into from
Jan 14, 2020
Merged
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
4057199
rustdoc: Don't allow `#![feature(...)]` on stable or beta
ollie27 Jan 7, 2020
9ef4fd7
Clarify the relationship between `extended` and `tools` in `config.toml`
varkor Jan 11, 2020
f9a5746
parse extended terminfo format
euclio Jan 7, 2020
b4fddf0
Forbid elided lifetimes within const generic parameter types.
skinnyBat Jan 12, 2020
9e46ddc
Added comment about behaviour.
skinnyBat Jan 12, 2020
82b90bd
Update test benchmark file
skinnyBat Jan 12, 2020
c32090c
Document behavior of set_nonblocking on UnixListener
tillarnold Jan 12, 2020
79f59fa
rustdoc: HTML escape arrows on help popup
ollie27 Jan 12, 2020
9d95eaa
Use `report_in_external_macro` for internal lints
afnanenayet Jan 4, 2020
13785c4
Remove unneeded scope
JohnTitor Jan 13, 2020
11f7418
Clean up E0191 explanation
GuillaumeGomez Jan 13, 2020
3ec0a84
Clean up E0192 explanation
GuillaumeGomez Jan 13, 2020
d975228
Tweak assertion note in fmt
JohnTitor Jan 13, 2020
fd162a4
Rollup merge of #67854 - afnanenayet:afnan/report-external-macro-lint…
JohnTitor Jan 14, 2020
9e47ddd
Rollup merge of #67989 - ollie27:rustdoc_unstable, r=GuillaumeGomez
JohnTitor Jan 14, 2020
974b699
Rollup merge of #68036 - euclio:libterm-ncurses6-fix, r=KodrAus
JohnTitor Jan 14, 2020
7da1dcc
Rollup merge of #68127 - varkor:clarify-extended-option, r=alexcrichton
JohnTitor Jan 14, 2020
d7e5992
Rollup merge of #68143 - skinny121:const-param-type-elided-lifetime, …
JohnTitor Jan 14, 2020
725f88b
Rollup merge of #68150 - tillarnold:master, r=cramertj
JohnTitor Jan 14, 2020
076d6a0
Rollup merge of #68166 - ollie27:rustdoc_help_escape, r=GuillaumeGomez
JohnTitor Jan 14, 2020
d6d5b74
Rollup merge of #68176 - GuillaumeGomez:clean-up-err-codes, r=Dylan-DPC
JohnTitor Jan 14, 2020
7d1cbc7
Rollup merge of #68179 - JohnTitor:nll-scope, r=varkor
JohnTitor Jan 14, 2020
b8c0e31
Rollup merge of #68188 - JohnTitor:tweak-assertion-note, r=Mark-Simul…
JohnTitor Jan 14, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Tweak assertion note in fmt
  • Loading branch information
JohnTitor committed Jan 13, 2020
commit d975228cedeaab828e91ab72d4d6fb5ded324de8
10 changes: 9 additions & 1 deletion src/bootstrap/format.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,15 @@ fn rustfmt(src: &Path, rustfmt: &Path, path: &Path, check: bool) {
cmd.arg(&path);
let cmd_debug = format!("{:?}", cmd);
let status = cmd.status().expect("executing rustfmt");
assert!(status.success(), "running {} successful", cmd_debug);
if !status.success() {
eprintln!(
"Running `{}` failed.\nIf you're running `tidy`, \
try again with `--bless` flag. Or, you just want to format \
code, run `./x.py fmt` instead.",
cmd_debug,
);
std::process::exit(1);
}
}

#[derive(serde::Deserialize)]
Expand Down