---

Sawyer47 · alexcrichton · commit 40b42e018d49 · 2014-06-18T17:01:56.000-07:00
yaml --- r: 118747 b: refs/heads/snap-stage3 c: bde851e h: refs/heads/master i: 118745: 74371f6 118743: b195988 v: v3
diff --git a/[refs] b/[refs]
@@ -1,7 +1,7 @@
 ---
 refs/heads/master: b1646cbfd908dc948b251e362669af421100647a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: b0dff7a19142b7d52d80ed62a14c1a6cb07cb647
+refs/heads/snap-stage3: bde851e969d327397ac1ab4bca05692069ff62a5
 refs/heads/try: 1813e5aa1a03b0596b8de7abd1af31edf5d6098f
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
diff --git a/branches/snap-stage3/src/librustc/middle/liveness.rs b/branches/snap-stage3/src/librustc/middle/liveness.rs
@@ -701,17 +701,12 @@ impl<'a> Liveness<'a> {
                 if self.loop_scope.len() == 0 {
                     self.ir.tcx.sess.span_bug(sp, "break outside loop");
                 } else {
-                    // FIXME(#5275): this shouldn't have to be a method...
-                    self.last_loop_scope()
+                    *self.loop_scope.last().unwrap()
                 }
             }
         }
     }
 
-    fn last_loop_scope(&self) -> NodeId {
-        *self.loop_scope.last().unwrap()
-    }
-
     #[allow(unused_must_use)]
     fn ln_str(&self, ln: LiveNode) -> String {
         let mut wr = io::MemWriter::new();

Original file line number	Diff line number	Diff line change
`@@ -701,17 +701,12 @@ impl<'a> Liveness<'a> {`
`701`	`701`	`if self.loop_scope.len() == 0 {`
`702`	`702`	`self.ir.tcx.sess.span_bug(sp, "break outside loop");`
`703`	`703`	`} else {`
`704`		`- // FIXME(#5275): this shouldn't have to be a method...`
`705`		`- self.last_loop_scope()`
	`704`	`+ *self.loop_scope.last().unwrap()`
`706`	`705`	`}`
`707`	`706`	`}`
`708`	`707`	`}`
`709`	`708`	`}`
`710`	`709`
`711`		`- fn last_loop_scope(&self) -> NodeId {`
`712`		`- *self.loop_scope.last().unwrap()`
`713`		`- }`
`714`		`-`
`715`	`710`	`#[allow(unused_must_use)]`
`716`	`711`	`fn ln_str(&self, ln: LiveNode) -> String {`
`717`	`712`	`let mut wr = io::MemWriter::new();`