---

yaml
---
r: 277546
b: refs/heads/try
c: 24f4b15
h: refs/heads/master

Author: nikomatsakis

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 6dbb0e86aec11050480beb76eade6fb805010ba7
 refs/heads/snap-stage3: 235d77457d80b549dad3ac36d94f235208a1eafb
-refs/heads/try: 94841bea7b5753ba29655ce60a99f329e8eb8f24
+refs/heads/try: 24f4b151b11b22b66ac0128f76c1e12cca45b178
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try/src/libsyntax/errors/snippet/mod.rs

@@ -229,10 +229,9 @@ impl<S1,S2> From<(S1, Style, S2, Style, RenderedLineKind)> for RenderedLine
 
 impl RenderedLine {
     fn trim_last(&mut self) {
-        if !self.text.is_empty() {
-            let last_text = &mut self.text.last_mut().unwrap().text;
-            let len = last_text.trim_right().len();
-            last_text.truncate(len);
+        if let Some(last_text) = self.text.last_mut() {
+            let len = last_text.text.trim_right().len();
+            last_text.text.truncate(len);
         }
     }
 }