bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

placate rustfmt in rustfmt.

Browse source
This commit is contained in:
Felix S. Klock II 2022-03-07 16:37:35 -05:00
parent 59d5c74c15
commit 673640d26d
2 changed files with 3 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/tools/rustfmt/src/parse/parser.rs
View file

@ -113,13 +113,7 @@ impl<'a> Parser<'a> {
let result = catch_unwind(AssertUnwindSafe(|| { let result = catch_unwind(AssertUnwindSafe(|| {
let mut parser = new_parser_from_file(sess.inner(), path, Some(span)); let mut parser = new_parser_from_file(sess.inner(), path, Some(span));
match parser.parse_mod(&TokenKind::Eof) { match parser.parse_mod(&TokenKind::Eof) {
Ok((a, Ok((a, i, spans)) => Some((a, i, spans.inner_span)),
i,
ast::ModSpans {
inner_span,
inject_use_span: _
}
)) => Some((a, i, inner_span)),
Err(mut e) => { Err(mut e) => {
e.emit(); e.emit();
if sess.can_reset_errors() { if sess.can_reset_errors() {

4
src/tools/rustfmt/src/visitor.rs
View file

@ -916,9 +916,9 @@ impl<'b, 'a: 'b> FmtVisitor<'a> {
self.push_str(&ident_str); self.push_str(&ident_str);
if let ast::ModKind::Loaded(ref items, ast::Inline::Yes, ref spans) = mod_kind { if let ast::ModKind::Loaded(ref items, ast::Inline::Yes, ref spans) = mod_kind {
let ast::ModSpans{ let ast::ModSpans {
inner_span, inner_span,
inject_use_span: _ inject_use_span: _,
} = *spans; } = *spans;
match self.config.brace_style() { match self.config.brace_style() {
BraceStyle::AlwaysNextLine => { BraceStyle::AlwaysNextLine => {