Rollup merge of #57107 - mjbshaw:thread_local_test, r=nikomatsakis

[rust.git] / src / test / ui / slightly-nice-generic-literal-messages.rs

diff --git a/src/test/ui/slightly-nice-generic-literal-messages.rs b/src/test/ui/slightly-nice-generic-literal-messages.rs
index 2eba7c2e534e15abc2458d34ae90644577c5d0cf..cd0ee174af52810813da3d7b27993e4b1b82d76f 100644 (file)
--- a/src/test/ui/slightly-nice-generic-literal-messages.rs
+++ b/src/test/ui/slightly-nice-generic-literal-messages.rs
@@ -1,13 +1,3 @@
-// Copyright 2014 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.
-
 use std::marker;
 
 struct Foo<T,U>(T, marker::PhantomData<U>);
@@ -18,7 +8,7 @@ fn main() {
     //~^ ERROR mismatched types
     //~| expected type `Foo<{float}, _>`
     //~| found type `{integer}`
-    //~| expected struct `Foo`, found integral variable
+    //~| expected struct `Foo`, found integer
     }
 
 }