Skip to content

Commit 4a0469e

Browse files
committed
Add copyright notice and kill broken test
1 parent e416c9f commit 4a0469e

File tree

2 files changed

+19
-2
lines changed

2 files changed

+19
-2
lines changed

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
111
/*!
212
313
# Type inference engine

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

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,23 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11+
// Test that free regions ordering only goes one way. That is,
12+
// we have `&'a Node<'self, T>`, which implies that `'a <= 'self`,
13+
// but not `'self <= 'a`. Hence returning `&self.val` (which has lifetime
14+
// `'a`) where `'self` is expected yields an error.
15+
//
16+
// This test began its life as a test for issue #4325.
17+
1118
struct Node<'self, T> {
1219
val: T,
1320
next: Option<&'self Node<'self, T>>
1421
}
1522

1623
impl<'self, T> Node<'self, T> {
17-
fn get(&self) -> &'self T {
24+
fn get<'a>(&'a self) -> &'self T {
1825
match self.next {
1926
Some(ref next) => next.get(),
20-
None => &self.val
27+
None => &self.val //~ ERROR cannot infer an appropriate lifetime
2128
}
2229
}
2330
}

0 commit comments

Comments
 (0)