New upstream version 1.48.0~beta.8+dfsg1

[rustc.git] / src / test / ui / vec / vec-res-add.rs

diff --git a/src/test/ui/vec/vec-res-add.rs b/src/test/ui/vec/vec-res-add.rs
index 27f6fc51164ad2b6833f504ce801ccca5ccafa40..57b552ee558193038cfa62a1cada97855fb2240f 100644 (file)
--- a/src/test/ui/vec/vec-res-add.rs
+++ b/src/test/ui/vec/vec-res-add.rs
@@ -1,21 +1,11 @@
-// 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.
-
 #[derive(Debug)]
-struct r {
+struct R {
   i:isize
 }
 
-fn r(i:isize) -> r { r { i: i } }
+fn r(i:isize) -> R { R { i: i } }
 
-impl Drop for r {
+impl Drop for R {
     fn drop(&mut self) {}
 }
 
@@ -24,6 +14,6 @@ fn main() {
     let i = vec![r(0)];
     let j = vec![r(1)];
     let k = i + j;
-    //~^ ERROR binary operation `+` cannot be applied to type
+    //~^ ERROR cannot add `Vec<R>` to `Vec<R>`
     println!("{:?}", j);
 }