Merge commit '3e7c6dec244539970b593824334876f8b6ed0b18' into clippyup

[rust.git] / src / test / ui / unconstrained-ref.rs

diff --git a/src/test/ui/unconstrained-ref.rs b/src/test/ui/unconstrained-ref.rs
index 6aaed789716a36d7847a4daf2a845c316b643625..473ca954b232d32ddb4be38c4fc1963a5415ecca 100644 (file)
--- a/src/test/ui/unconstrained-ref.rs
+++ b/src/test/ui/unconstrained-ref.rs
@@ -1,18 +1,7 @@
-// Copyright 2012-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.
-
 struct S<'a, T:'a> {
     o: &'a Option<T>
 }
 
 fn main() {
     S { o: &None }; //~ ERROR type annotations needed [E0282]
-                    //~| NOTE cannot infer type for `T`
 }