---

yaml
---
r: 205138
b: refs/heads/tmp
c: edb2ee5
h: refs/heads/master
v: v3

Author: nrc

[refs]

@@ -32,7 +32,7 @@ refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
 refs/heads/beta: f0213d8ffb128a16f94af7ee985dc61484596163
 refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
-refs/heads/tmp: 0d258516cb88b4f54f672b1c7b4f11002aabd83d
+refs/heads/tmp: edb2ee510b08b0fadedd3cb56b188cf69ecf2a6a
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
 refs/tags/homu-tmp: f0ac7e04e647381e2bb87de1f3d0b108acb24d06
 refs/heads/gate: 97c84447b65164731087ea82685580cc81424412

branches/tmp/src/test/compile-fail/for-expn-2.rs

@@ -0,0 +1,18 @@
+// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+// Test that we get an expansion stack for `for` loops.
+
+// error-pattern:in expansion of for loop expansion
+
+fn main() {
+    for t in &foo {
+    }
+}

branches/tmp/src/test/compile-fail/for-expn.rs

@@ -0,0 +1,19 @@
+// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+// Test that an error on a sub-expresson in a for loop has the correct span.
+
+fn main() {
+    // Odd formatting to make sure we get the right span.
+    for t in &
+      foo //~ ERROR unresolved name `foo`
+    {
+    }
+}