diff options
| author | Esteban Küber <esteban@kuber.com.ar> | 2018-08-30 16:01:08 -0700 |
|---|---|---|
| committer | Esteban Küber <esteban@kuber.com.ar> | 2018-08-30 16:01:08 -0700 |
| commit | da9ba98fad3a8278d8c6ff570d74592bc10e9870 (patch) | |
| tree | ca6ed53920cd92109e4a4c511332b0d4c6d7613f | |
| parent | 70ed4f972e73f5fe8c11c4ac0cf98d13b30083b9 (diff) | |
| download | rust-da9ba98fad3a8278d8c6ff570d74592bc10e9870.tar.gz rust-da9ba98fad3a8278d8c6ff570d74592bc10e9870.zip | |
Format code
| -rw-r--r-- | src/librustc_mir/hair/pattern/check_match.rs | 16 | ||||
| -rw-r--r-- | src/librustc_save_analysis/span_utils.rs | 3 |
2 files changed, 11 insertions, 8 deletions
diff --git a/src/librustc_mir/hair/pattern/check_match.rs b/src/librustc_mir/hair/pattern/check_match.rs index 604cc61a17e..890a7b5cda2 100644 --- a/src/librustc_mir/hair/pattern/check_match.rs +++ b/src/librustc_mir/hair/pattern/check_match.rs @@ -540,12 +540,16 @@ fn check_legality_of_move_bindings(cx: &MatchVisitor, "cannot bind by-move into a pattern guard") .span_label(p.span, "moves value into pattern guard") .emit(); - } else if by_ref_span.is_some() { - struct_span_err!(cx.tcx.sess, p.span, E0009, - "cannot bind by-move and by-ref in the same pattern") - .span_label(p.span, "by-move pattern here") - .span_label(by_ref_span.unwrap(), "both by-ref and by-move used") - .emit(); + } else if let Some(by_ref_span) = by_ref_span { + struct_span_err!( + cx.tcx.sess, + p.span, + E0009, + "cannot bind by-move and by-ref in the same pattern", + ) + .span_label(p.span, "by-move pattern here") + .span_label(by_ref_span, "both by-ref and by-move used") + .emit(); } }; diff --git a/src/librustc_save_analysis/span_utils.rs b/src/librustc_save_analysis/span_utils.rs index e1a3829cd75..cc5c722e4f6 100644 --- a/src/librustc_save_analysis/span_utils.rs +++ b/src/librustc_save_analysis/span_utils.rs @@ -154,8 +154,7 @@ impl<'a> SpanUtils<'a> { let loc = self.sess.source_map().lookup_char_pos(span.lo()); span_bug!( span, - "Mis-counted brackets when breaking path? Parsing '{}' \ - in {}, line {}", + "Mis-counted brackets when breaking path? Parsing '{}' in {}, line {}", self.snippet(span), loc.file.name, loc.line |