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

[rust.git] / src / test / ui / noncopyable-class.rs

diff --git a/src/test/ui/noncopyable-class.rs b/src/test/ui/noncopyable-class.rs
index f5712b0c957ba40363b0a36902a50de54900f989..11b6eb736e9db9e79cac854c5ac31646bce4a1b5 100644 (file)
--- a/src/test/ui/noncopyable-class.rs
+++ b/src/test/ui/noncopyable-class.rs
@@ -1,39 +1,29 @@
-// 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.
-
 // Test that a class with a non-copyable field can't be
 // copied
 
 #[derive(Debug)]
-struct bar {
+struct Bar {
   x: isize,
 }
 
-impl Drop for bar {
+impl Drop for Bar {
     fn drop(&mut self) {}
 }
 
-fn bar(x:isize) -> bar {
-    bar {
+fn bar(x:isize) -> Bar {
+    Bar {
         x: x
     }
 }
 
 #[derive(Debug)]
-struct foo {
+struct Foo {
   i: isize,
-  j: bar,
+  j: Bar,
 }
 
-fn foo(i:isize) -> foo {
-    foo {
+fn foo(i:isize) -> Foo {
+    Foo {
         i: i,
         j: bar(5)
     }