Skip to content

Commit

Permalink
Add copyright notice and kill broken test
Browse files Browse the repository at this point in the history
  • Loading branch information
nikomatsakis committed Jul 2, 2013
1 parent e416c9f commit 4a0469e
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 2 deletions.
10 changes: 10 additions & 0 deletions src/librustc/middle/typeck/infer/doc.rs
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
}
Expand Down

0 comments on commit 4a0469e

Please sign in to comment.