---

yaml
---
r: 277937
b: refs/heads/auto
c: 24f4b15
h: refs/heads/master
i:
  277935: 0b155bd

Author: nikomatsakis

[refs]

@@ -8,7 +8,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: 94841bea7b5753ba29655ce60a99f329e8eb8f24
+refs/heads/auto: 24f4b151b11b22b66ac0128f76c1e12cca45b178
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336
 refs/tags/0.2: 1754d02027f2924bed83b0160ee340c7f41d5ea1

branches/auto/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);
         }
     }
 }