diff options
| author | bors <bors@rust-lang.org> | 2021-01-08 03:09:03 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-01-08 03:09:03 +0000 |
| commit | 9155a9dae522bbedd42b4a11366d8157da0614ec (patch) | |
| tree | 380cc035422ea61e9b39c6c0d0dfcdd75bf2b9d7 /compiler/rustc_parse/src | |
| parent | 92c625d0f76a6f74930b1647b0b77f53824e5a8d (diff) | |
| parent | dec3dbd36a572222ad96b9f18b39b4f916614fcd (diff) | |
| download | rust-9155a9dae522bbedd42b4a11366d8157da0614ec.tar.gz rust-9155a9dae522bbedd42b4a11366d8157da0614ec.zip | |
Auto merge of #80806 - JohnTitor:rollup-y64z7ph, r=JohnTitor
Rollup of 7 pull requests Successful merges: - #79675 (Make sure rust-call errors occur correctly for traits) - #80372 (Don't panic when an external crate can't be resolved) - #80761 (handle generic trait methods in coverage-report tests) - #80785 (rustc_ast_pretty: Remove `PrintState::insert_extra_parens`) - #80791 (Fix type name in doc example for Iter and IterMut) - #80794 (Use Option::map_or instead of `.map(..).unwrap_or(..)`) - #80799 (Get rid of custom pretty-printing in rustdoc) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_parse/src')
| -rw-r--r-- | compiler/rustc_parse/src/lib.rs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/compiler/rustc_parse/src/lib.rs b/compiler/rustc_parse/src/lib.rs index 4fa9768febb..0da9cd3fe5e 100644 --- a/compiler/rustc_parse/src/lib.rs +++ b/compiler/rustc_parse/src/lib.rs @@ -283,8 +283,7 @@ pub fn nt_to_tokenstream( } else if matches!(synthesize_tokens, CanSynthesizeMissingTokens::Yes) { return fake_token_stream(sess, nt); } else { - let pretty = rustc_ast_pretty::pprust::nonterminal_to_string_no_extra_parens(&nt); - panic!("Missing tokens for nt {:?}", pretty); + panic!("Missing tokens for nt {:?}", pprust::nonterminal_to_string(nt)); } } |