diff options
| author | bors <bors@rust-lang.org> | 2019-07-10 23:02:44 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-07-10 23:02:44 +0000 |
| commit | 35cacbce1661366250a877da4fa5b6b4cb03542e (patch) | |
| tree | 345ce24b5fe515e9b8db95f0971244464326073a /src/libsyntax/parse/parser.rs | |
| parent | cd2cd4c9627e52c33e68e8c93a8916dc11094cbb (diff) | |
| parent | 3c299a987cfd9522c4e1f6e53ed79123b4a4acab (diff) | |
| download | rust-35cacbce1661366250a877da4fa5b6b4cb03542e.tar.gz rust-35cacbce1661366250a877da4fa5b6b4cb03542e.zip | |
Auto merge of #62561 - Centril:rollup-5pxj3bo, r=Centril
Rollup of 5 pull requests
Successful merges:
- #62275 (rustc_mir: treat DropAndReplace as Drop + Assign in qualify_consts.)
- #62465 (Sometimes generate storage statements for temporaries with type `!`)
- #62481 (Use `fold` in `Iterator::last` default implementation)
- #62493 (#62357: doc(ptr): add example for {read,write}_unaligned)
- #62532 (Some more cleanups to syntax::print)
Failed merges:
r? @ghost
Diffstat (limited to 'src/libsyntax/parse/parser.rs')
| -rw-r--r-- | src/libsyntax/parse/parser.rs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index a95b6891fb9..83dbff6b2d5 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -2571,7 +2571,6 @@ impl<'a> Parser<'a> { None => continue, }; let sugg = pprust::to_string(|s| { - use crate::print::pprust::PrintState; s.popen(); s.print_expr(&e); s.s.word( "."); @@ -4588,11 +4587,11 @@ impl<'a> Parser<'a> { stmt_span = stmt_span.with_hi(self.prev_span.hi()); } let sugg = pprust::to_string(|s| { - use crate::print::pprust::{PrintState, INDENT_UNIT}; + use crate::print::pprust::INDENT_UNIT; s.ibox(INDENT_UNIT); s.bopen(); s.print_stmt(&stmt); - s.bclose_maybe_open(stmt.span, INDENT_UNIT, false) + s.bclose_maybe_open(stmt.span, false) }); e.span_suggestion( stmt_span, |