Rollup merge of #62337 - Mark-Simulacrum:fix-cpu-usage-script, r=alexcrichton

[rust.git] / src / test / ui / issues / issue-3154.rs

diff --git a/src/test/ui/issues/issue-3154.rs b/src/test/ui/issues/issue-3154.rs
index 519e9d06d1b33c1c4558ed19b86f534aa03cce6a..91c7203c1d002d5023b1be39e10ac39b12fc21fe 100644 (file)
--- a/src/test/ui/issues/issue-3154.rs
+++ b/src/test/ui/issues/issue-3154.rs
@@ -1,19 +1,9 @@
-// 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.
-
-struct thing<'a, Q:'a> {
+struct Thing<'a, Q:'a> {
     x: &'a Q
 }
 
-fn thing<'a,Q>(x: &Q) -> thing<'a,Q> {
-    thing{ x: x } //~ ERROR 16:5: 16:18: explicit lifetime required in the type of `x` [E0621]
+fn thing<'a,Q>(x: &Q) -> Thing<'a,Q> {
+    Thing { x: x } //~ ERROR explicit lifetime required in the type of `x` [E0621]
 }
 
 fn main() {