---

yaml
---
r: 68583
b: refs/heads/auto
c: 4a0469e
h: refs/heads/master
i:
  68581: e5a230d
  68579: 5d00a1e
  68575: 9321238
v: v3

Author: nikomatsakis

[refs]

@@ -14,6 +14,6 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: e416c9fa17b6b6668e2c2b0b619466840a810931
+refs/heads/auto: 4a0469e3d70868db7ab27841e57080cff8e546b3
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c

branches/auto/src/librustc/middle/typeck/infer/doc.rs

@@ -1,3 +1,13 @@
+// Copyright 2012 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.
+
 /*!
 
 # Type inference engine

branches/auto/src/test/run-pass/issue-4325.rs renamed to branches/auto/src/test/compile-fail/regions-free-region-ordering-incorrect.rs

@@ -8,16 +8,23 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// Test that free regions ordering only goes one way. That is,
+// we have `&'a Node<'self, T>`, which implies that `'a <= 'self`,
+// but not `'self <= 'a`. Hence returning `&self.val` (which has lifetime
+// `'a`) where `'self` is expected yields an error.
+//
+// This test began its life as a test for issue #4325.
+
 struct Node<'self, T> {
   val: T,
   next: Option<&'self Node<'self, T>>
 }
 
 impl<'self, T> Node<'self, T> {
-  fn get(&self) -> &'self T {
+  fn get<'a>(&'a self) -> &'self T {
     match self.next {
       Some(ref next) => next.get(),
-      None => &self.val
+      None => &self.val //~ ERROR cannot infer an appropriate lifetime
     }
   }
 }